Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[NFC] Fix variable types in DAO doc blocks #14294

Merged
merged 1 commit into from
May 23, 2019
Merged

[NFC] Fix variable types in DAO doc blocks #14294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CRM/ACL/DAO/ACL.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/ACL/ACL.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:de12a8f0949faa12a7ffc89b7abfd7b7)
* (GenCodeChecksum:810da5f19a7ead8c949065156674c087)
*/

/**
Expand All @@ -31,7 +31,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO {
/**
* Unique table ID
*
* @var int unsigned
* @var int
*/
public $id;

Expand All @@ -45,7 +45,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO {
/**
* Is this ACL entry Allow (0) or Deny (1) ?
*
* @var boolean
* @var bool
*/
public $deny;

Expand Down
3 changes: 2 additions & 1 deletion CRM/Core/CodeGen/Specification.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ public function getField(&$fieldXML, &$fields) {
// need this case since some versions of mysql do not have boolean as a valid column type and hence it
// is changed to tinyint. hopefully after 2 yrs this case can be removed.
$field['sqlType'] = 'tinyint';
$field['phpType'] = $type;
$field['phpType'] = 'bool';
$field['crmType'] = 'CRM_Utils_Type::T_' . strtoupper($type);
break;

Expand All @@ -340,6 +340,7 @@ public function getField(&$fieldXML, &$fields) {
$field['phpType'] = $this->value('phpType', $fieldXML, $type);
$field['sqlType'] = $type;
if ($type == 'int unsigned') {
$field['phpType'] = 'int';
$field['crmType'] = 'CRM_Utils_Type::T_INT';
}
else {
Expand Down