Skip to content

Commit 3ef8a1a

Browse files
AlainBenbassatAlainBenbassat
authored
Merge pull request #2 from civicrm/master
getting newest code
2 parents 35300eb + 6c96d01 commit 3ef8a1a

File tree

320 files changed

+3873
-3142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

320 files changed

+3873
-3142
lines changed

‎CRM/ACL/DAO/ACL.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Generated from xml/schema/CRM/ACL/ACL.xml
88
* DO NOT EDIT. Generated by CRM_Core_CodeGen
9-
* (GenCodeChecksum:71681f363debd53627c4c98a9032b0f6)
9+
* (GenCodeChecksum:810da5f19a7ead8c949065156674c087)
1010
*/
1111

1212
/**
@@ -31,7 +31,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO {
3131
/**
3232
* Unique table ID
3333
*
34-
* @var int unsigned
34+
* @var int
3535
*/
3636
public $id;
3737

@@ -45,7 +45,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO {
4545
/**
4646
* Is this ACL entry Allow (0) or Deny (1) ?
4747
*
48-
* @var boolean
48+
* @var bool
4949
*/
5050
public $deny;
5151

@@ -59,7 +59,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO {
5959
/**
6060
* ID of the object possessing this ACL
6161
*
62-
* @var int unsigned
62+
* @var int
6363
*/
6464
public $entity_id;
6565

@@ -80,7 +80,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO {
8080
/**
8181
* The ID of the object controlled by this ACL entry
8282
*
83-
* @var int unsigned
83+
* @var int
8484
*/
8585
public $object_id;
8686

@@ -94,14 +94,14 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO {
9494
/**
9595
* ID of the ACL or ACL group being granted/revoked
9696
*
97-
* @var int unsigned
97+
* @var int
9898
*/
9999
public $acl_id;
100100

101101
/**
102102
* Is this property active?
103103
*
104-
* @var boolean
104+
* @var bool
105105
*/
106106
public $is_active;
107107

@@ -223,7 +223,7 @@ public static function &fields() {
223223
],
224224
'pseudoconstant' => [
225225
'callback' => 'CRM_ACL_BAO_ACL::operation',
226-
]
226+
],
227227
],
228228
'object_table' => [
229229
'name' => 'object_table',

‎CRM/ACL/DAO/Cache.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Generated from xml/schema/CRM/ACL/Cache.xml
88
* DO NOT EDIT. Generated by CRM_Core_CodeGen
9-
* (GenCodeChecksum:7551610e08f73f20ef3e5b9ef6782f80)
9+
* (GenCodeChecksum:f993d89f3a44999eed1b4c46b714b736)
1010
*/
1111

1212
/**
@@ -31,21 +31,21 @@ class CRM_ACL_DAO_Cache extends CRM_Core_DAO {
3131
/**
3232
* Unique table ID
3333
*
34-
* @var int unsigned
34+
* @var int
3535
*/
3636
public $id;
3737

3838
/**
3939
* Foreign Key to Contact
4040
*
41-
* @var int unsigned
41+
* @var int
4242
*/
4343
public $contact_id;
4444

4545
/**
4646
* Foreign Key to ACL
4747
*
48-
* @var int unsigned
48+
* @var int
4949
*/
5050
public $acl_id;
5151

‎CRM/ACL/DAO/EntityRole.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Generated from xml/schema/CRM/ACL/EntityRole.xml
88
* DO NOT EDIT. Generated by CRM_Core_CodeGen
9-
* (GenCodeChecksum:c53e5bc404fee6d3f005fbaf15abdb4e)
9+
* (GenCodeChecksum:65952cc85e04acddbaef65cfcf7fc541)
1010
*/
1111

1212
/**
@@ -31,14 +31,14 @@ class CRM_ACL_DAO_EntityRole extends CRM_Core_DAO {
3131
/**
3232
* Unique table ID
3333
*
34-
* @var int unsigned
34+
* @var int
3535
*/
3636
public $id;
3737

3838
/**
3939
* Foreign Key to ACL Role (which is an option value pair and hence an implicit FK)
4040
*
41-
* @var int unsigned
41+
* @var int
4242
*/
4343
public $acl_role_id;
4444

@@ -52,14 +52,14 @@ class CRM_ACL_DAO_EntityRole extends CRM_Core_DAO {
5252
/**
5353
* ID of the group/contact object being joined
5454
*
55-
* @var int unsigned
55+
* @var int
5656
*/
5757
public $entity_id;
5858

5959
/**
6060
* Is this property active?
6161
*
62-
* @var boolean
62+
* @var bool
6363
*/
6464
public $is_active;
6565

‎CRM/Activity/DAO/Activity.php

+25-25
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Generated from xml/schema/CRM/Activity/Activity.xml
88
* DO NOT EDIT. Generated by CRM_Core_CodeGen
9-
* (GenCodeChecksum:ffa557668a214e3683b1692238ad74ae)
9+
* (GenCodeChecksum:808e801e250ba56b83f69fe90d8b52c2)
1010
*/
1111

1212
/**
@@ -31,21 +31,21 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
3131
/**
3232
* Unique Other Activity ID
3333
*
34-
* @var int unsigned
34+
* @var int
3535
*/
3636
public $id;
3737

3838
/**
3939
* 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.
4040
*
41-
* @var int unsigned
41+
* @var int
4242
*/
4343
public $source_record_id;
4444

4545
/**
4646
* FK to civicrm_option_value.id, that has to be valid, registered activity type.
4747
*
48-
* @var int unsigned
48+
* @var int
4949
*/
5050
public $activity_type_id;
5151

@@ -66,7 +66,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
6666
/**
6767
* Planned or actual duration of activity expressed in minutes. Conglomerate of former duration_hours and duration_minutes.
6868
*
69-
* @var int unsigned
69+
* @var int
7070
*/
7171
public $duration;
7272

@@ -80,7 +80,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
8080
/**
8181
* Phone ID of the number called (optional - used if an existing phone number is selected).
8282
*
83-
* @var int unsigned
83+
* @var int
8484
*/
8585
public $phone_id;
8686

@@ -101,57 +101,57 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
101101
/**
102102
* ID of the status this activity is currently in. Foreign key to civicrm_option_value.
103103
*
104-
* @var int unsigned
104+
* @var int
105105
*/
106106
public $status_id;
107107

108108
/**
109109
* ID of the priority given to this activity. Foreign key to civicrm_option_value.
110110
*
111-
* @var int unsigned
111+
* @var int
112112
*/
113113
public $priority_id;
114114

115115
/**
116116
* Parent meeting ID (if this is a follow-up item). This is not currently implemented
117117
*
118-
* @var int unsigned
118+
* @var int
119119
*/
120120
public $parent_id;
121121

122122
/**
123-
* @var boolean
123+
* @var bool
124124
*/
125125
public $is_test;
126126

127127
/**
128128
* Activity Medium, Implicit FK to civicrm_option_value where option_group = encounter_medium.
129129
*
130-
* @var int unsigned
130+
* @var int
131131
*/
132132
public $medium_id;
133133

134134
/**
135-
* @var boolean
135+
* @var bool
136136
*/
137137
public $is_auto;
138138

139139
/**
140140
* FK to Relationship ID
141141
*
142-
* @var int unsigned
142+
* @var int
143143
*/
144144
public $relationship_id;
145145

146146
/**
147-
* @var boolean
147+
* @var bool
148148
*/
149149
public $is_current_revision;
150150

151151
/**
152152
* Activity ID of the first activity record in versioning chain.
153153
*
154-
* @var int unsigned
154+
* @var int
155155
*/
156156
public $original_id;
157157

@@ -163,21 +163,21 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
163163
public $result;
164164

165165
/**
166-
* @var boolean
166+
* @var bool
167167
*/
168168
public $is_deleted;
169169

170170
/**
171171
* The campaign for which this activity has been triggered.
172172
*
173-
* @var int unsigned
173+
* @var int
174174
*/
175175
public $campaign_id;
176176

177177
/**
178178
* Assign a specific level of engagement to this activity. Used for tracking constituents in ladder of engagement.
179179
*
180-
* @var int unsigned
180+
* @var int
181181
*/
182182
public $engagement_level;
183183

@@ -189,7 +189,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
189189
/**
190190
* Activity marked as favorite.
191191
*
192-
* @var boolean
192+
* @var bool
193193
*/
194194
public $is_star;
195195

@@ -288,7 +288,7 @@ public static function &fields() {
288288
'pseudoconstant' => [
289289
'optionGroupName' => 'activity_type',
290290
'optionEditPath' => 'civicrm/admin/options/activity_type',
291-
]
291+
],
292292
],
293293
'activity_subject' => [
294294
'name' => 'subject',
@@ -430,7 +430,7 @@ public static function &fields() {
430430
'pseudoconstant' => [
431431
'optionGroupName' => 'activity_status',
432432
'optionEditPath' => 'civicrm/admin/options/activity_status',
433-
]
433+
],
434434
],
435435
'priority_id' => [
436436
'name' => 'priority_id',
@@ -448,7 +448,7 @@ public static function &fields() {
448448
'pseudoconstant' => [
449449
'optionGroupName' => 'priority',
450450
'optionEditPath' => 'civicrm/admin/options/priority',
451-
]
451+
],
452452
],
453453
'parent_id' => [
454454
'name' => 'parent_id',
@@ -496,7 +496,7 @@ public static function &fields() {
496496
'pseudoconstant' => [
497497
'optionGroupName' => 'encounter_medium',
498498
'optionEditPath' => 'civicrm/admin/options/encounter_medium',
499-
]
499+
],
500500
],
501501
'is_auto' => [
502502
'name' => 'is_auto',
@@ -604,7 +604,7 @@ public static function &fields() {
604604
'table' => 'civicrm_campaign',
605605
'keyColumn' => 'id',
606606
'labelColumn' => 'title',
607-
]
607+
],
608608
],
609609
'activity_engagement_level' => [
610610
'name' => 'engagement_level',
@@ -624,7 +624,7 @@ public static function &fields() {
624624
'pseudoconstant' => [
625625
'optionGroupName' => 'engagement_index',
626626
'optionEditPath' => 'civicrm/admin/options/engagement_index',
627-
]
627+
],
628628
],
629629
'weight' => [
630630
'name' => 'weight',

0 commit comments

Comments
 (0)