Merge pull request #14294 from eileenmcnaughton/stds

[NFC] Fix variable types in DAO doc blocks
civicrm · May 23, 2019 · 2b6c13e · 2b6c13e
2 parents 1f94fbf + a296e35
commit 2b6c13e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CRM/ACL/DAO/ACL.php b/CRM/ACL/DAO/ACL.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/ACL/ACL.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:de12a8f0949faa12a7ffc89b7abfd7b7)
+ * (GenCodeChecksum:810da5f19a7ead8c949065156674c087)
  */
 
 /**
@@ -31,7 +31,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO {
   /**
    * Unique table ID
    *
-   * @var int unsigned
+   * @var int
    */
   public $id;
 
@@ -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;
 

diff --git a/CRM/Core/CodeGen/Specification.php b/CRM/Core/CodeGen/Specification.php
@@ -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;
 
@@ -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 {