Merge pull request #2 from civicrm/master

getting newest code
JMAConsulting · May 23, 2019 · 3ef8a1a · 3ef8a1a
2 parents 35300eb + 6c96d01
commit 3ef8a1a
Show file tree

Hide file tree

Showing 320 changed files with 3,873 additions and 3,142 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:71681f363debd53627c4c98a9032b0f6)
+ * (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;
 
@@ -59,7 +59,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO {
   /**
    * ID of the object possessing this ACL
    *
-   * @var int unsigned
+   * @var int
    */
   public $entity_id;
 
@@ -80,7 +80,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO {
   /**
    * The ID of the object controlled by this ACL entry
    *
-   * @var int unsigned
+   * @var int
    */
   public $object_id;
 
@@ -94,14 +94,14 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO {
   /**
    * ID of the ACL or ACL group being granted/revoked
    *
-   * @var int unsigned
+   * @var int
    */
   public $acl_id;
 
   /**
    * Is this property active?
    *
-   * @var boolean
+   * @var bool
    */
   public $is_active;
 
@@ -223,7 +223,7 @@ public static function &fields() {
           ],
           'pseudoconstant' => [
             'callback' => 'CRM_ACL_BAO_ACL::operation',
-          ]
+          ],
         ],
         'object_table' => [
           'name' => 'object_table',

diff --git a/CRM/ACL/DAO/Cache.php b/CRM/ACL/DAO/Cache.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/ACL/Cache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7551610e08f73f20ef3e5b9ef6782f80)
+ * (GenCodeChecksum:f993d89f3a44999eed1b4c46b714b736)
  */
 
 /**
@@ -31,21 +31,21 @@ class CRM_ACL_DAO_Cache extends CRM_Core_DAO {
   /**
    * Unique table ID
    *
-   * @var int unsigned
+   * @var int
    */
   public $id;
 
   /**
    * Foreign Key to Contact
    *
-   * @var int unsigned
+   * @var int
    */
   public $contact_id;
 
   /**
    * Foreign Key to ACL
    *
-   * @var int unsigned
+   * @var int
    */
   public $acl_id;
 

diff --git a/CRM/ACL/DAO/EntityRole.php b/CRM/ACL/DAO/EntityRole.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/ACL/EntityRole.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c53e5bc404fee6d3f005fbaf15abdb4e)
+ * (GenCodeChecksum:65952cc85e04acddbaef65cfcf7fc541)
  */
 
 /**
@@ -31,14 +31,14 @@ class CRM_ACL_DAO_EntityRole extends CRM_Core_DAO {
   /**
    * Unique table ID
    *
-   * @var int unsigned
+   * @var int
    */
   public $id;
 
   /**
    * Foreign Key to ACL Role (which is an option value pair and hence an implicit FK)
    *
-   * @var int unsigned
+   * @var int
    */
   public $acl_role_id;
 
@@ -52,14 +52,14 @@ class CRM_ACL_DAO_EntityRole extends CRM_Core_DAO {
   /**
    * ID of the group/contact object being joined
    *
-   * @var int unsigned
+   * @var int
    */
   public $entity_id;
 
   /**
    * Is this property active?
    *
-   * @var boolean
+   * @var bool
    */
   public $is_active;
 

diff --git a/CRM/Activity/DAO/Activity.php b/CRM/Activity/DAO/Activity.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Activity/Activity.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ffa557668a214e3683b1692238ad74ae)
+ * (GenCodeChecksum:808e801e250ba56b83f69fe90d8b52c2)
  */
 
 /**
@@ -31,21 +31,21 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
   /**
    * Unique  Other Activity ID
    *
-   * @var int unsigned
+   * @var int
    */
   public $id;
 
   /**
    * Artificial FK to original transaction (e.g. contribution) IF it is not an Activity. Table can be figured out through activity_type_id, and further through component registry.
    *
-   * @var int unsigned
+   * @var int
    */
   public $source_record_id;
 
   /**
    * FK to civicrm_option_value.id, that has to be valid, registered activity type.
    *
-   * @var int unsigned
+   * @var int
    */
   public $activity_type_id;
 
@@ -66,7 +66,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
   /**
    * Planned or actual duration of activity expressed in minutes. Conglomerate of former duration_hours and duration_minutes.
    *
-   * @var int unsigned
+   * @var int
    */
   public $duration;
 
@@ -80,7 +80,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
   /**
    * Phone ID of the number called (optional - used if an existing phone number is selected).
    *
-   * @var int unsigned
+   * @var int
    */
   public $phone_id;
 
@@ -101,57 +101,57 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
   /**
    * ID of the status this activity is currently in. Foreign key to civicrm_option_value.
    *
-   * @var int unsigned
+   * @var int
    */
   public $status_id;
 
   /**
    * ID of the priority given to this activity. Foreign key to civicrm_option_value.
    *
-   * @var int unsigned
+   * @var int
    */
   public $priority_id;
 
   /**
    * Parent meeting ID (if this is a follow-up item). This is not currently implemented
    *
-   * @var int unsigned
+   * @var int
    */
   public $parent_id;
 
   /**
-   * @var boolean
+   * @var bool
    */
   public $is_test;
 
   /**
    * Activity Medium, Implicit FK to civicrm_option_value where option_group = encounter_medium.
    *
-   * @var int unsigned
+   * @var int
    */
   public $medium_id;
 
   /**
-   * @var boolean
+   * @var bool
    */
   public $is_auto;
 
   /**
    * FK to Relationship ID
    *
-   * @var int unsigned
+   * @var int
    */
   public $relationship_id;
 
   /**
-   * @var boolean
+   * @var bool
    */
   public $is_current_revision;
 
   /**
    * Activity ID of the first activity record in versioning chain.
    *
-   * @var int unsigned
+   * @var int
    */
   public $original_id;
 
@@ -163,21 +163,21 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
   public $result;
 
   /**
-   * @var boolean
+   * @var bool
    */
   public $is_deleted;
 
   /**
    * The campaign for which this activity has been triggered.
    *
-   * @var int unsigned
+   * @var int
    */
   public $campaign_id;
 
   /**
    * Assign a specific level of engagement to this activity. Used for tracking constituents in ladder of engagement.
    *
-   * @var int unsigned
+   * @var int
    */
   public $engagement_level;
 
@@ -189,7 +189,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
   /**
    * Activity marked as favorite.
    *
-   * @var boolean
+   * @var bool
    */
   public $is_star;
 
@@ -288,7 +288,7 @@ public static function &fields() {
           'pseudoconstant' => [
             'optionGroupName' => 'activity_type',
             'optionEditPath' => 'civicrm/admin/options/activity_type',
-          ]
+          ],
         ],
         'activity_subject' => [
           'name' => 'subject',
@@ -430,7 +430,7 @@ public static function &fields() {
           'pseudoconstant' => [
             'optionGroupName' => 'activity_status',
             'optionEditPath' => 'civicrm/admin/options/activity_status',
-          ]
+          ],
         ],
         'priority_id' => [
           'name' => 'priority_id',
@@ -448,7 +448,7 @@ public static function &fields() {
           'pseudoconstant' => [
             'optionGroupName' => 'priority',
             'optionEditPath' => 'civicrm/admin/options/priority',
-          ]
+          ],
         ],
         'parent_id' => [
           'name' => 'parent_id',
@@ -496,7 +496,7 @@ public static function &fields() {
           'pseudoconstant' => [
             'optionGroupName' => 'encounter_medium',
             'optionEditPath' => 'civicrm/admin/options/encounter_medium',
-          ]
+          ],
         ],
         'is_auto' => [
           'name' => 'is_auto',
@@ -604,7 +604,7 @@ public static function &fields() {
             'table' => 'civicrm_campaign',
             'keyColumn' => 'id',
             'labelColumn' => 'title',
-          ]
+          ],
         ],
         'activity_engagement_level' => [
           'name' => 'engagement_level',
@@ -624,7 +624,7 @@ public static function &fields() {
           'pseudoconstant' => [
             'optionGroupName' => 'engagement_index',
             'optionEditPath' => 'civicrm/admin/options/engagement_index',
-          ]
+          ],
         ],
         'weight' => [
           'name' => 'weight',