Commit 518fa0ee authored by Seamus Lee's avatar Seamus Lee

(NFC) Update CRM/Core CRM/Custom CRM/Dedupe to match the new coder style

parent 3e313be3
......@@ -74,10 +74,10 @@ class CRM_Core_Action {
* bit manipulation operations so we can perform multiple
* actions on the same object if needed
*
* @var array $_names type of variable name to action constant
* @var array
*
*/
static $_names = [
public static $_names = [
'add' => self::ADD,
'update' => self::UPDATE,
'view' => self::VIEW,
......@@ -102,7 +102,7 @@ class CRM_Core_Action {
*
* @var array
*/
static $_description;
public static $_description;
/**
* Called by the request object to translate a string into a mask.
......
......@@ -36,8 +36,9 @@ class CRM_Core_BAO_Block {
/**
* Fields that are required for a valid block.
* @var array
*/
static $requiredBlockFields = [
public static $requiredBlockFields = [
'email' => ['email'],
'phone' => ['phone'],
'im' => ['name'],
......
......@@ -51,7 +51,7 @@ class CRM_Core_BAO_Cache extends CRM_Core_DAO_Cache {
/**
* @var array ($cacheKey => $cacheValue)
*/
static $_cache = NULL;
public static $_cache = NULL;
/**
* Retrieve an item from the DB cache.
......@@ -359,6 +359,7 @@ class CRM_Core_BAO_Cache extends CRM_Core_DAO_Cache {
* @param bool $session
* @param bool $table
* @param bool $prevNext
* @param bool $expired
*/
public static function cleanup($session = FALSE, $table = FALSE, $prevNext = FALSE, $expired = FALSE) {
// clean up the session cache every $cacheCleanUpNumber probabilistically
......
......@@ -716,7 +716,7 @@ ORDER BY civicrm_custom_group.weight,
* @return string
* SQL condition.
*/
static private function whereListHas($column, $value, $delimiter = CRM_Core_DAO::VALUE_SEPARATOR) {
private static function whereListHas($column, $value, $delimiter = CRM_Core_DAO::VALUE_SEPARATOR) {
// ?
$bareValue = trim($value, $delimiter);
$escapedValue = CRM_Utils_Type::escape("%{$delimiter}{$bareValue}{$delimiter}%", 'String', FALSE);
......@@ -736,7 +736,7 @@ ORDER BY civicrm_custom_group.weight,
* @return bool
* does this entity have data in this custom table
*/
static public function customGroupDataExistsForEntity($entityID, $table, $getCount = FALSE) {
public static function customGroupDataExistsForEntity($entityID, $table, $getCount = FALSE) {
$query = "
SELECT count(id)
FROM $table
......@@ -765,7 +765,7 @@ ORDER BY civicrm_custom_group.weight,
* @param array $singleFieldTablesWithEntityData
* Array of tables in which this entity has data.
*/
static public function buildEntityTreeSingleFields(&$groupTree, $entityID, $entitySingleSelectClauses, $singleFieldTablesWithEntityData) {
public static function buildEntityTreeSingleFields(&$groupTree, $entityID, $entitySingleSelectClauses, $singleFieldTablesWithEntityData) {
$select = implode(', ', $entitySingleSelectClauses);
$fromSQL = " (SELECT $entityID as entity_id ) as first ";
foreach ($singleFieldTablesWithEntityData as $table) {
......@@ -796,7 +796,7 @@ ORDER BY civicrm_custom_group.weight,
* @param string|int $singleRecord
* holds 'new' or id if view/edit/copy form for a single record is being loaded.
*/
static public function buildEntityTreeMultipleFields(&$groupTree, $entityID, $entityMultipleSelectClauses, $multipleFieldTablesWithEntityData, $singleRecord = NULL) {
public static function buildEntityTreeMultipleFields(&$groupTree, $entityID, $entityMultipleSelectClauses, $multipleFieldTablesWithEntityData, $singleRecord = NULL) {
foreach ($entityMultipleSelectClauses as $table => $selectClauses) {
$select = implode(',', $selectClauses);
$query = "
......@@ -827,7 +827,7 @@ ORDER BY civicrm_custom_group.weight,
* @param string|int $singleRecord
* holds 'new' OR id if view/edit/copy form for a single record is being loaded.
*/
static public function buildTreeEntityDataFromQuery(&$groupTree, $query, $includedTables, $singleRecord = NULL) {
public static function buildTreeEntityDataFromQuery(&$groupTree, $query, $includedTables, $singleRecord = NULL) {
$dao = CRM_Core_DAO::executeQuery($query);
while ($dao->fetch()) {
foreach ($groupTree as $groupID => $group) {
......@@ -864,7 +864,7 @@ ORDER BY civicrm_custom_group.weight,
* @param string|int $singleRecord
* holds 'new' or id if loading view/edit/copy for a single record.
*/
static public function buildCustomFieldData($dao, &$groupTree, $table, $groupID, $fieldID, $singleRecord = NULL) {
public static function buildCustomFieldData($dao, &$groupTree, $table, $groupID, $fieldID, $singleRecord = NULL) {
$column = $groupTree[$groupID]['fields'][$fieldID]['column_name'];
$idName = "{$table}_id";
$fieldName = "{$table}_{$column}";
......
......@@ -102,7 +102,7 @@ class CRM_Core_BAO_CustomOption {
* -rp = rowcount
* -page= offset
*/
static public function getOptionListSelector(&$params) {
public static function getOptionListSelector(&$params) {
$options = [];
$field = CRM_Core_BAO_CustomField::getFieldObject($params['fid']);
......
......@@ -79,10 +79,10 @@ class CRM_Core_BAO_CustomQuery {
public $_qill;
/**
* @deprecated
* No longer needed due to CRM-17646 refactoring, but still used in some places
*
* @var array
* @deprecated
*/
public $_options;
......@@ -107,7 +107,7 @@ class CRM_Core_BAO_CustomQuery {
*
* @var array
*/
static $extendsMap = [
public static $extendsMap = [
'Contact' => 'civicrm_contact',
'Individual' => 'civicrm_contact',
'Household' => 'civicrm_contact',
......
......@@ -157,7 +157,6 @@ class CRM_Core_BAO_CustomValue extends CRM_Core_DAO {
}
}
/**
* @param array $formValues
* @return null
......
......@@ -35,6 +35,7 @@
* Class contains Contact dashboard related functions.
*/
class CRM_Core_BAO_Dashboard extends CRM_Core_DAO_Dashboard {
/**
* Add Dashboard.
*
......@@ -175,7 +176,7 @@ class CRM_Core_BAO_Dashboard extends CRM_Core_DAO_Dashboard {
* the default dashlets.
*
* @return array
* Array of dashboard_id's
* Array of dashboard_id's
* @throws \CiviCRM_API3_Exception
*/
public static function initializeDashlets() {
......
......@@ -38,11 +38,13 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain {
/**
* Cache for the current domain object.
* @var object
*/
static $_domain = NULL;
public static $_domain = NULL;
/**
* Cache for a domain's location array
* @var array
*/
private $_location = NULL;
......@@ -164,7 +166,7 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain {
/**
* @param bool $skipFatal
*
* @param bool $returnString
* @return array
* name & email for domain
* @throws Exception
......
......@@ -38,7 +38,7 @@
*/
class CRM_Core_BAO_File extends CRM_Core_DAO_File {
static $_signableFields = ['entityTable', 'entityID', 'fileID'];
public static $_signableFields = ['entityTable', 'entityID', 'fileID'];
/**
* Takes an associative array and creates a File object.
......@@ -95,7 +95,6 @@ class CRM_Core_BAO_File extends CRM_Core_DAO_File {
return [NULL, NULL];
}
/**
* @param $data
* @param int $fileTypeID
......@@ -695,7 +694,6 @@ AND CEF.entity_id = %2";
self::deleteEntityFile($params['entityTable'], $params['entityID'], NULL, $params['fileID']);
}
/**
* Display paper icon for a file attachment -- CRM-13624
*
......@@ -772,6 +770,8 @@ AND CEF.entity_id = %2";
*
* @param int $entityId entity id the file is attached to
* @param int $fileId file ID
* @param int $genTs
* @param int $life
* @return string
*/
public static function generateFileHash($entityId = NULL, $fileId = NULL, $genTs = NULL, $life = NULL) {
......
......@@ -36,6 +36,7 @@ class CRM_Core_BAO_FinancialTrxn extends CRM_Financial_DAO_FinancialTrxn {
*
* @return \CRM_Financial_DAO_FinancialTrxn
*/
/**
*/
public function __construct() {
......@@ -139,6 +140,7 @@ class CRM_Core_BAO_FinancialTrxn extends CRM_Financial_DAO_FinancialTrxn {
* @param bool $newTrxn
* @param string $whereClause
* Additional where parameters
* @param int $fromAccountID
*
* @return array
* array of category id's the contact belongs to.
......
......@@ -149,7 +149,7 @@ class CRM_Core_BAO_Job extends CRM_Core_DAO_Job {
* Make a copy of a Job.
*
* @param int $id The job id to copy.
*
* @param array $params
* @return CRM_Core_DAO
*/
public static function copy($id, $params = []) {
......
......@@ -39,11 +39,13 @@ class CRM_Core_BAO_LabelFormat extends CRM_Core_DAO_OptionValue {
/**
* Static holder for the Label Formats Option Group ID.
* @var int
*/
private static $_gid = NULL;
/**
* Label Format fields stored in the 'value' field of the Option Value table.
* @var array
*/
private static $optionValueFields = [
'paper-size' => [
......@@ -258,7 +260,7 @@ class CRM_Core_BAO_LabelFormat extends CRM_Core_DAO_OptionValue {
/**
* Add ordering fields to Label Format list.
*
* @param array (reference) $list List of Label Formats
* @param array $list List of Label Formats
* @param string $returnURL
* URL of page calling this function.
*
......@@ -382,7 +384,7 @@ class CRM_Core_BAO_LabelFormat extends CRM_Core_DAO_OptionValue {
*
* @param string $field
* Name of a label format field.
* @param array (reference) $values associative array of name/value pairs containing
* @param array $values associative array of name/value pairs containing
* label format field selections
*
* @param null $default
......@@ -458,7 +460,7 @@ class CRM_Core_BAO_LabelFormat extends CRM_Core_DAO_OptionValue {
/**
* Save the Label Format in the DB.
*
* @param array (reference) $values associative array of name/value pairs
* @param array $values associative array of name/value pairs
* @param int $id
* Id of the database record (null = new record).
* @param string $groupName
......
......@@ -38,8 +38,9 @@ class CRM_Core_BAO_Location extends CRM_Core_DAO {
/**
* Location block element array.
* @var array
*/
static $blocks = ['phone', 'email', 'im', 'openid', 'address'];
public static $blocks = ['phone', 'email', 'im', 'openid', 'address'];
/**
* Create various elements of location block.
......@@ -109,11 +110,11 @@ class CRM_Core_BAO_Location extends CRM_Core_DAO {
}
foreach ([
'phone',
'email',
'im',
'address',
] as $loc) {
'phone',
'email',
'im',
'address',
] as $loc) {
$locBlock["{$loc}_id"] = !empty($location["$loc"][0]) ? $location["$loc"][0]->id : NULL;
$locBlock["{$loc}_2_id"] = !empty($location["$loc"][1]) ? $location["$loc"][1]->id : NULL;
}
......@@ -367,12 +368,12 @@ WHERE e.id = %1";
$nonPrimaryBlockIds = CRM_Contact_BAO_Contact::getLocBlockIds($contactId, ['is_primary' => 0]);
foreach ([
'Email',
'IM',
'Phone',
'Address',
'OpenID',
] as $block) {
'Email',
'IM',
'Phone',
'Address',
'OpenID',
] as $block) {
$name = strtolower($block);
if (array_key_exists($name, $primaryLocBlockIds) &&
!CRM_Utils_System::isNull($primaryLocBlockIds[$name])
......
......@@ -36,9 +36,10 @@ class CRM_Core_BAO_LocationType extends CRM_Core_DAO_LocationType {
/**
* Static holder for the default LT.
* @var int
*/
static $_defaultLocationType = NULL;
static $_billingLocationType = NULL;
public static $_defaultLocationType = NULL;
public static $_billingLocationType = NULL;
/**
* Class constructor.
......
......@@ -35,7 +35,7 @@
* BAO object for crm_log table
*/
class CRM_Core_BAO_Log extends CRM_Core_DAO_Log {
static $_processed = NULL;
public static $_processed = NULL;
/**
* @param int $id
......
......@@ -396,10 +396,10 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping {
//we need to unset groups, tags, notes for component export
if ($exportMode != CRM_Export_Form_Select::CONTACT_EXPORT) {
foreach ([
'groups',
'tags',
'notes',
] as $value) {
'groups',
'tags',
'notes',
] as $value) {
unset($fields['Individual'][$value]);
unset($fields['Household'][$value]);
unset($fields['Organization'][$value]);
......@@ -983,7 +983,6 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping {
return $groupTitle;
}
/**
* Function returns all Custom group Names.
*
......
......@@ -272,9 +272,9 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
$smarty = CRM_Core_Smarty::singleton();
foreach ([
'text',
'html',
] as $elem) {
'text',
'html',
] as $elem) {
$$elem = $smarty->fetch("string:{$$elem}");
}
......@@ -427,9 +427,9 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate {
}
else {
CRM_Core_Error::fatal(ts('No such message template: option group %1, option value %2.', [
1 => $params['groupName'],
2 => $params['valueName'],
]));
1 => $params['groupName'],
2 => $params['valueName'],
]));
}
}
......
......@@ -792,7 +792,7 @@ FROM civicrm_navigation WHERE domain_id = $domainID";
*
* @return bool|\CRM_Core_DAO
*/
static public function createOrUpdateTopLevelReportsNavItem($domain_id) {
public static function createOrUpdateTopLevelReportsNavItem($domain_id) {
$id = NULL;
$dao = new CRM_Core_BAO_Navigation();
......@@ -892,7 +892,7 @@ FROM civicrm_navigation WHERE domain_id = $domainID";
* If True then do not match with a url that has a different parent
* (This is because for top level items there is a risk of 'stealing' rows that normally
* live under 'Contact' and intentionally duplicate the report examples.)
*
* @param bool $useWildcard
* @return \CRM_Core_DAO_Navigation
*/
protected static function createOrUpdateReportNavItem($name, $url, $url_params, $parent_id, $permission,
......@@ -996,7 +996,7 @@ FROM civicrm_navigation WHERE domain_id = $domainID";
'name' => 'CiviCRM Home',
'url' => 'civicrm/dashboard?reset=1',
'weight' => 1,
]
],
],
[
'attributes' => [
......@@ -1004,7 +1004,7 @@ FROM civicrm_navigation WHERE domain_id = $domainID";
'name' => 'Hide Menu',
'url' => '#hidemenu',
'weight' => 2,
]
],
],
[
'attributes' => [
......@@ -1012,7 +1012,7 @@ FROM civicrm_navigation WHERE domain_id = $domainID";
'name' => 'Log out',
'url' => 'civicrm/logout?reset=1',
'weight' => 3,
]
],
],
];
return;
......
......@@ -133,7 +133,7 @@ class CRM_Core_BAO_Note extends CRM_Core_DAO_Note {
* (reference) an assoc array of name/value pairs.
* @param array $ids
* (deprecated) associated array with note id - preferably set $params['id'].
* @return null|object $note
* @return null|object
* $note CRM_Core_BAO_Note object
* @throws \CRM_Exception
*/
......
......@@ -39,11 +39,13 @@ class CRM_Core_BAO_PaperSize extends CRM_Core_DAO_OptionValue {
/**
* Static holder for the Paper Size Option Group ID.
* @var int
*/
private static $_gid = NULL;
/**
* Paper Size fields stored in the 'value' field of the Option Value table.
* @var array
*/
private static $optionValueFields = [
'metric' => [
......@@ -84,7 +86,7 @@ class CRM_Core_BAO_PaperSize extends CRM_Core_DAO_OptionValue {
/**
* Add ordering fields to Paper Size list.
*
* @param array (reference) $list List of Paper Sizes
* @param array $list List of Paper Sizes
* @param string $returnURL
* URL of page calling this function.
*
......@@ -196,7 +198,7 @@ class CRM_Core_BAO_PaperSize extends CRM_Core_DAO_OptionValue {
*
* @param string $field
* Name of a Paper Size field.
* @param array (reference) $values associative array of name/value pairs containing
* @param array $values associative array of name/value pairs containing
* Paper Size field selections
*
* @param null $default
......@@ -263,7 +265,7 @@ class CRM_Core_BAO_PaperSize extends CRM_Core_DAO_OptionValue {
/**
* Save the Paper Size in the DB.
*
* @param array (reference) $values associative array of name/value pairs
* @param array $values associative array of name/value pairs
* @param int $id
* Id of the database record (null = new record).
*/
......
......@@ -39,11 +39,13 @@ class CRM_Core_BAO_PdfFormat extends CRM_Core_DAO_OptionValue {
/**
* Static holder for the PDF Page Formats Option Group ID.
* @var int
*/
private static $_gid = NULL;
/**
* PDF Page Format fields stored in the 'value' field of the Option Value table.
* @var array
*/
private static $optionValueFields = [
'paper_size' => [
......@@ -139,7 +141,7 @@ class CRM_Core_BAO_PdfFormat extends CRM_Core_DAO_OptionValue {
/**
* Add ordering fields to Page Format list.
*
* @param array (reference) $list List of PDF Page Formats
* @param array $list List of PDF Page Formats
* @param string $returnURL
* URL of page calling this function.
*/
......@@ -253,7 +255,7 @@ class CRM_Core_BAO_PdfFormat extends CRM_Core_DAO_OptionValue {
*
* @param string $field
* Name of a PDF Page Format field.
* @param array (reference) $values associative array of name/value pairs containing
* @param array $values associative array of name/value pairs containing
* PDF Page Format field selections
*
* @param null $default
......
......@@ -34,8 +34,9 @@ class CRM_Core_BAO_PreferencesDate extends CRM_Core_DAO_PreferencesDate {
/**
* Static holder for the default LT.
* @var string
*/
static $_defaultPreferencesDate = NULL;
public static $_defaultPreferencesDate = NULL;
/**
* Class constructor.
......
......@@ -157,7 +157,8 @@ WHERE cacheKey = %3 AND
if (isset($cacheKey)) {
$sql .= " AND cacheKey LIKE %4";
$params[4] = ["{$cacheKey}%", 'String']; // used % to address any row with conflict-cacheKey e.g "merge Individual_8_0_conflicts"
// used % to address any row with conflict-cacheKey e.g "merge Individual_8_0_conflicts"
$params[4] = ["{$cacheKey}%", 'String'];
}
CRM_Core_DAO::executeQuery($sql, $params);
......@@ -288,7 +289,7 @@ FROM civicrm_prevnext_cache pn
if (!empty($select)) {
$extraData = [];
foreach ($select as $sfield) {
$extraData[$sfield] = $dao->$sfield;
$extraData[$sfield] = $dao->$sfield;
}
$main[$count] = [
'prevnext_id' => $dao->id,
......@@ -438,7 +439,6 @@ AND c.created_date < date_sub( NOW( ), INTERVAL %2 day )
CRM_Core_DAO::executeQuery($sql, $params);
}
/**
* Get the selections.
*
......
......@@ -59,7 +59,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
public static $status = NULL;
static $_recurringEntityHelper
public static $_recurringEntityHelper
= [
'civicrm_event' => [
'helper_class' => 'CRM_Event_DAO_Event',
......@@ -73,7 +73,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
],
];
static $_dateColumns
public static $_dateColumns
= [
'civicrm_event' => [
'dateColumns' => ['start_date'],
......@@ -85,7 +85,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
],
];
static $_tableDAOMapper
public static $_tableDAOMapper
= [
'civicrm_event' => 'CRM_Event_DAO_Event',
'civicrm_price_set_entity' => 'CRM_Price_DAO_PriceSetEntity',
......@@ -96,7 +96,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
'civicrm_activity_contact' => 'CRM_Activity_DAO_ActivityContact',
];
static $_updateSkipFields
public static $_updateSkipFields
= [
'civicrm_event' => ['start_date', 'end_date'],
'civicrm_tell_friend' => ['entity_id'],
......@@ -104,7 +104,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
'civicrm_activity' => ['activity_date_time'],
];
static $_linkedEntitiesInfo
public static $_linkedEntitiesInfo
= [
'civicrm_tell_friend' => [
'entity_id_col' => 'entity_id',
......@@ -418,7 +418,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
* @return array
* an array of child ids
*/
static public function getEntitiesForParent($parentId, $entityTable, $includeParent = TRUE, $mode = 3, $initiatorId = NULL) {
public static function getEntitiesForParent($parentId, $entityTable, $includeParent = TRUE, $mode = 3, $initiatorId = NULL) {
$entities = [];
if (empty($parentId) || empty($entityTable)) {
return $entities;
......@@ -454,7 +454,8 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
$recurringEntityID = CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_recurring_entity WHERE entity_id = %3 AND entity_table = %2", $queryParams);
if ($recurringEntityID) {
$query .= $includeParent ? " AND id >= %4" : " AND id > %4";
$query .= " ORDER BY id ASC"; // FIXME: change to order by dates
// FIXME: change to order by dates
$query .= " ORDER BY id ASC";
$queryParams[4] = [$recurringEntityID, 'Integer'];
}
else {
......@@ -488,7 +489,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
* @return array
* array of connected ids
*/
static public function getEntitiesFor($entityId, $entityTable, $includeParent = TRUE, $mode = 3) {
public static function getEntitiesFor($entityId, $entityTable, $includeParent = TRUE, $mode = 3) {
$parentId = self::getParentFor($entityId, $entityTable);
if ($parentId) {
return self::getEntitiesForParent($parentId, $entityTable, $includeParent, $mode, $entityId);
......@@ -510,7 +511,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
* @return int
* unsigned $parentId Parent ID
*/
static public function getParentFor($entityId, $entityTable, $includeParent = TRUE) {
public static function getParentFor($entityId, $entityTable, $includeParent = TRUE) {
if (empty($entityId) || empty($entityTable)) {
return NULL;
}
......@@ -539,7 +540,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
* @param $entityTable
* @return array|null
*/
static public function getPositionAndCount($entityId, $entityTable) {
public static function getPositionAndCount($entityId, $entityTable) {
$position = $count = 0;
$query = "
......@@ -581,7 +582,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
*
* @return object
*/
static public function copyCreateEntity($entityTable, $fromCriteria, $newParams, $createRecurringEntity = TRUE) {
public static function copyCreateEntity($entityTable, $fromCriteria, $newParams, $createRecurringEntity = TRUE) {
$daoName = self::$_tableDAOMapper[$entityTable];
if (!$daoName) {
CRM_Core_Error::fatal("DAO Mapper missing for $entityTable.");
......@@ -608,7 +609,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
* @param object $event
* An object of /Civi/Core/DAO/Event/PostUpdate containing dao object that was just updated.
*/
static public function triggerUpdate($event) {
public static function triggerUpdate($event) {
// if DB version is earlier than 4.6 skip any processing
static $currentVer = NULL;
if (!$currentVer) {
......@@ -676,7 +677,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
* @param object $event
* An object of /Civi/Core/DAO/Event/PostUpdate containing dao object that was just inserted.
*/
static public function triggerInsert($event) {
public static function triggerInsert($event) {
$obj =& $event->object;
if (!array_key_exists($obj->__table, self::$_linkedEntitiesInfo)) {
return;
......@@ -783,7 +784,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
* @param object $event
* An object of /Civi/Core/DAO/Event/PostUpdate containing dao object that was just deleted.
*/
static public function triggerDelete($event) {
public static function triggerDelete($event) {
$obj =& $event->object;
// if DB version is earlier than 4.6 skip any processing
......@@ -828,7 +829,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
* @return bool|\CRM_Core_DAO_RecurringEntity
* @throws \Exception
*/
static public function delEntity($entityId, $entityTable, $isDelLinkedEntities = FALSE) {
public static function delEntity($entityId, $entityTable, $isDelLinkedEntities = FALSE) {
if (empty($entityId) || empty($entityTable)) {
return FALSE; </