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.

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

[NFC] formatting & comment fixes - Regenerate DAO files #14304

Merged
merged 1 commit into from
May 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Regenerate DAO files
  • Loading branch information
eileenmcnaughton committed May 23, 2019
commit e6ca0a57f0e807c880e52b264a2def7f9acf0058
8 changes: 4 additions & 4 deletions CRM/ACL/DAO/ACL.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;

Expand All @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions CRM/ACL/DAO/Cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/ACL/Cache.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:b919f30ea14a662689df5a39dd0eb9e5)
* (GenCodeChecksum:f993d89f3a44999eed1b4c46b714b736)
*/

/**
Expand All @@ -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;

Expand Down
10 changes: 5 additions & 5 deletions CRM/ACL/DAO/EntityRole.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/ACL/EntityRole.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:f5e0b7220bbbd48205500aa4372771a7)
* (GenCodeChecksum:65952cc85e04acddbaef65cfcf7fc541)
*/

/**
Expand All @@ -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;

Expand All @@ -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;

Expand Down
50 changes: 25 additions & 25 deletions CRM/Activity/DAO/Activity.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Activity/Activity.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:9e7a03aebc84a1f18a1cb0cbbe989986)
* (GenCodeChecksum:808e801e250ba56b83f69fe90d8b52c2)
*/

/**
Expand All @@ -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;

Expand All @@ -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;

Expand All @@ -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;

Expand All @@ -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;

Expand All @@ -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;

Expand All @@ -189,7 +189,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO {
/**
* Activity marked as favorite.
*
* @var boolean
* @var bool
*/
public $is_star;

Expand Down Expand Up @@ -288,7 +288,7 @@ public static function &fields() {
'pseudoconstant' => [
'optionGroupName' => 'activity_type',
'optionEditPath' => 'civicrm/admin/options/activity_type',
]
],
],
'activity_subject' => [
'name' => 'subject',
Expand Down Expand Up @@ -430,7 +430,7 @@ public static function &fields() {
'pseudoconstant' => [
'optionGroupName' => 'activity_status',
'optionEditPath' => 'civicrm/admin/options/activity_status',
]
],
],
'priority_id' => [
'name' => 'priority_id',
Expand All @@ -448,7 +448,7 @@ public static function &fields() {
'pseudoconstant' => [
'optionGroupName' => 'priority',
'optionEditPath' => 'civicrm/admin/options/priority',
]
],
],
'parent_id' => [
'name' => 'parent_id',
Expand Down Expand Up @@ -496,7 +496,7 @@ public static function &fields() {
'pseudoconstant' => [
'optionGroupName' => 'encounter_medium',
'optionEditPath' => 'civicrm/admin/options/encounter_medium',
]
],
],
'is_auto' => [
'name' => 'is_auto',
Expand Down Expand Up @@ -604,7 +604,7 @@ public static function &fields() {
'table' => 'civicrm_campaign',
'keyColumn' => 'id',
'labelColumn' => 'title',
]
],
],
'activity_engagement_level' => [
'name' => 'engagement_level',
Expand All @@ -624,7 +624,7 @@ public static function &fields() {
'pseudoconstant' => [
'optionGroupName' => 'engagement_index',
'optionEditPath' => 'civicrm/admin/options/engagement_index',
]
],
],
'weight' => [
'name' => 'weight',
Expand Down
12 changes: 6 additions & 6 deletions CRM/Activity/DAO/ActivityContact.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Activity/ActivityContact.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:12b192898c90e1f206f245eaf49834ea)
* (GenCodeChecksum:bb5726fd8dc1e07e19a08982d502a9f1)
*/

/**
Expand All @@ -31,28 +31,28 @@ class CRM_Activity_DAO_ActivityContact extends CRM_Core_DAO {
/**
* Activity contact id
*
* @var int unsigned
* @var int
*/
public $id;

/**
* Foreign key to the activity for this record.
*
* @var int unsigned
* @var int
*/
public $activity_id;

/**
* Foreign key to the contact for this record.
*
* @var int unsigned
* @var int
*/
public $contact_id;

/**
* Nature of this contact's role in the activity: 1 assignee, 2 creator, 3 focus or target.
*
* @var int unsigned
* @var int
*/
public $record_type_id;

Expand Down Expand Up @@ -144,7 +144,7 @@ public static function &fields() {
'pseudoconstant' => [
'optionGroupName' => 'activity_contacts',
'optionEditPath' => 'civicrm/admin/options/activity_contacts',
]
],
],
];
CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'fields_callback', Civi::$statics[__CLASS__]['fields']);
Expand Down
Loading