From e60f24ebb67f474bcc8437003b9c91d9853b3819 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Thu, 8 Jan 2015 18:03:18 -0800 Subject: [PATCH] INFRA-132 - s/null/NULL/ --- CRM/Activity/BAO/ICalendar.php | 4 ++-- CRM/Contact/BAO/Contact/Optimizer.php | 4 ++-- CRM/Contact/BAO/Group.php | 20 ++++++++++---------- CRM/Contact/BAO/GroupContact.php | 6 +++--- CRM/Contact/BAO/GroupContactCache.php | 10 +++++----- CRM/Contact/Form/Edit/Individual.php | 2 +- CRM/Contact/Form/Inline/Address.php | 2 +- CRM/Contact/Form/Inline/CustomData.php | 2 +- CRM/Contact/Form/Inline/Phone.php | 2 +- CRM/Contact/Form/ProfileContact.php | 2 +- CRM/Contact/Form/Search.php | 8 ++++---- CRM/Contact/Form/Search/Builder.php | 4 ++-- CRM/Contact/Form/Search/Custom/Group.php | 8 ++++---- CRM/Contribute/BAO/Query.php | 4 ++-- CRM/Contribute/Form/AdditionalInfo.php | 2 +- CRM/Core/BAO/FinancialTrxn.php | 10 +++++----- CRM/Core/BAO/Mapping.php | 8 ++++---- CRM/Core/BAO/MessageTemplate.php | 6 +++--- CRM/Core/BAO/Navigation.php | 4 ++-- CRM/Core/BAO/Note.php | 6 +++--- CRM/Core/BAO/PrevNextCache.php | 18 +++++++++--------- CRM/Core/BAO/SchemaHandler.php | 8 ++++---- CRM/Core/I18n/SchemaStructure_4_2_alpha1.php | 6 +++--- CRM/Core/I18n/SchemaStructure_4_3_1.php | 6 +++--- CRM/Core/I18n/SchemaStructure_4_5_alpha1.php | 6 +++--- CRM/Core/I18n/SchemaStructure_4_5_beta2.php | 6 +++--- CRM/Core/Invoke.php | 2 +- CRM/Logging/Differ.php | 2 +- 28 files changed, 84 insertions(+), 84 deletions(-) diff --git a/CRM/Activity/BAO/ICalendar.php b/CRM/Activity/BAO/ICalendar.php index fccd94a09a..427199eecd 100644 --- a/CRM/Activity/BAO/ICalendar.php +++ b/CRM/Activity/BAO/ICalendar.php @@ -65,7 +65,7 @@ class CRM_Activity_BAO_ICalendar { * @param array $contacts * Array of contacts (attendees). * - * @return string Array index of the added attachment in the $attachments array, or else null. + * @return string Array index of the added attachment in the $attachments array, or else NULL. */ public function addAttachment(&$attachments, $contacts) { // Check preferences setting @@ -101,7 +101,7 @@ class CRM_Activity_BAO_ICalendar { } } } - return null; + return NULL; } public function cleanup() { diff --git a/CRM/Contact/BAO/Contact/Optimizer.php b/CRM/Contact/BAO/Contact/Optimizer.php index b1c2bae4ab..bcf8a33157 100644 --- a/CRM/Contact/BAO/Contact/Optimizer.php +++ b/CRM/Contact/BAO/Contact/Optimizer.php @@ -53,7 +53,7 @@ class CRM_Contact_BAO_Contact_Optimizer { $oldWebsiteValues = CRM_Utils_Array::value('website', $oldValues); $newWebsiteValues = CRM_Utils_Array::value('website', $newValues); - if ($oldWebsiteValues == null || $newWebsiteValues == null) { + if ($oldWebsiteValues == NULL || $newWebsiteValues == NULL) { return; } @@ -116,7 +116,7 @@ class CRM_Contact_BAO_Contact_Optimizer { $oldEmailValues = CRM_Utils_Array::value('email', $oldValues); $newEmailValues = CRM_Utils_Array::value('email', $newValues); - if ($oldEmailValues == null || $newEmailValues == null) { + if ($oldEmailValues == NULL || $newEmailValues == NULL) { return; } diff --git a/CRM/Contact/BAO/Group.php b/CRM/Contact/BAO/Group.php index dc040fa5d8..843fca7c4d 100644 --- a/CRM/Contact/BAO/Group.php +++ b/CRM/Contact/BAO/Group.php @@ -74,7 +74,7 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { * @param int $id * Group id. * - * @return null + * @return NULL * @static * */ @@ -230,9 +230,9 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { * Which properties should be included in the returned group objects. * (member_count should be last element.) * - * @param null $sort - * @param null $offset - * @param null $rowCount + * @param NULL $sort + * @param NULL $offset + * @param NULL $rowCount * * @return array of group objects. * @@ -309,7 +309,7 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { * @param int $id * The id of the object. * - * @return string the permission that the user has (or null) + * @return string the permission that the user has (or NULL) * @static */ public static function checkPermission($id) { @@ -348,7 +348,7 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { * @param array $params * Associative array of parameters. * - * @return object|null The new group BAO (if created) + * @return object|NULL The new group BAO (if created) * @static */ public static function &create(&$params) { @@ -530,7 +530,7 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { * @param array $params * Associative array of parameters. * - * @return object|null The new group BAO (if created) + * @return object|NULL The new group BAO (if created) * @static */ public static function createSmartGroup(&$params) { @@ -560,7 +560,7 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { * @param bool $isActive * Value we want to set the is_active field. * - * @return Object DAO object on sucess, null otherwise + * @return Object DAO object on sucess, NULL otherwise * @static */ public static function setIsActive($id, $isActive) { @@ -989,7 +989,7 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { * @param array $groupIDs * Array of group ids. * - * @param null $parents + * @param NULL $parents * @param string $spacer * @param bool $titleOnly * @@ -1121,7 +1121,7 @@ WHERE id IN $groupIdString /** * @param array $params * - * @return null|string + * @return NULL|string */ public static function getGroupCount(&$params) { $whereClause = self::whereClause($params, FALSE); diff --git a/CRM/Contact/BAO/GroupContact.php b/CRM/Contact/BAO/GroupContact.php index 865cf46aa7..7a347b5a24 100644 --- a/CRM/Contact/BAO/GroupContact.php +++ b/CRM/Contact/BAO/GroupContact.php @@ -176,7 +176,7 @@ class CRM_Contact_BAO_GroupContact extends CRM_Contact_DAO_GroupContact { * * @param string $method * @param string $status - * @param null $tracking + * @param NULL $tracking * * @return array (total, removed, notRemoved) count of contacts removed to group * @static @@ -462,7 +462,7 @@ class CRM_Contact_BAO_GroupContact extends CRM_Contact_DAO_GroupContact { * @static */ public static function getMembershipDetail($contactId, $groupID, $method = 'Email') { - $leftJoin = $where = $orderBy = null; + $leftJoin = $where = $orderBy = NULL; if ($method) { //CRM-13341 add group_id clause @@ -717,7 +717,7 @@ AND group_id IN ( $groupIDString ) * The id of the group. * @param string $method * @param string $status - * @param null $tracking + * @param NULL $tracking * * @return array (total, added, notAdded) count of contacts added to group * @static diff --git a/CRM/Contact/BAO/GroupContactCache.php b/CRM/Contact/BAO/GroupContactCache.php index 9c79144121..2ba68e681f 100644 --- a/CRM/Contact/BAO/GroupContactCache.php +++ b/CRM/Contact/BAO/GroupContactCache.php @@ -65,7 +65,7 @@ class CRM_Contact_BAO_GroupContactCache extends CRM_Contact_DAO_GroupContactCach * @return string the sql query which lists the groups that need to be refreshed * @static */ - public static function groupRefreshedClause($groupIDClause = null, $includeHiddenGroups = FALSE) { + public static function groupRefreshedClause($groupIDClause = NULL, $includeHiddenGroups = FALSE) { $smartGroupCacheTimeout = self::smartGroupCacheTimeout(); $now = CRM_Utils_Date::getUTCTime(); @@ -123,11 +123,11 @@ AND ( g.cache_date IS NULL OR * * @return boolean true if we did not regenerate, false if we did */ - public static function loadAll($groupIDs = null, $limit = 0) { + public static function loadAll($groupIDs = NULL, $limit = 0) { // ensure that all the smart groups are loaded // this function is expensive and should be sparingly used if groupIDs is empty if (empty($groupIDs)) { - $groupIDClause = null; + $groupIDClause = NULL; $groupIDs = array(); } else { @@ -315,7 +315,7 @@ WHERE id IN ( $groupIDs ) unset(self::$_alreadyLoaded[$groupID]); } - $refresh = null; + $refresh = NULL; $params = array(); $smartGroupCacheTimeout = self::smartGroupCacheTimeout(); @@ -642,7 +642,7 @@ ORDER BY gc.contact_id, g.children $dao = CRM_Core_DAO::executeQuery($sql); $contactGroup = array(); - $prevContactID = null; + $prevContactID = NULL; while ($dao->fetch()) { if ( $prevContactID && diff --git a/CRM/Contact/Form/Edit/Individual.php b/CRM/Contact/Form/Edit/Individual.php index 319ed3a2cd..627af134b9 100644 --- a/CRM/Contact/Form/Edit/Individual.php +++ b/CRM/Contact/Form/Edit/Individual.php @@ -123,7 +123,7 @@ class CRM_Contact_Form_Edit_Individual { TRUE ); - if ($checkSimilar == null) { + if ($checkSimilar == NULL) { $checkSimilar = 0; } $form->assign('checkSimilar', $checkSimilar); diff --git a/CRM/Contact/Form/Inline/Address.php b/CRM/Contact/Form/Inline/Address.php index 4f6bc5efab..97d387f2d6 100644 --- a/CRM/Contact/Form/Inline/Address.php +++ b/CRM/Contact/Form/Inline/Address.php @@ -72,7 +72,7 @@ class CRM_Contact_Form_Inline_Address extends CRM_Contact_Form_Inline { $locBlockNo = CRM_Utils_Request::retrieve('locno', 'Positive', CRM_Core_DAO::$_nullObject, TRUE, NULL, $_REQUEST); $name = "Address_{$locBlockNo}"; - parent::__construct(null, CRM_Core_Action::NONE, 'post', $name); + parent::__construct(NULL, CRM_Core_Action::NONE, 'post', $name); } /** diff --git a/CRM/Contact/Form/Inline/CustomData.php b/CRM/Contact/Form/Inline/CustomData.php index 4bc42e68ba..cbb2dbf84c 100644 --- a/CRM/Contact/Form/Inline/CustomData.php +++ b/CRM/Contact/Form/Inline/CustomData.php @@ -63,7 +63,7 @@ class CRM_Contact_Form_Inline_CustomData extends CRM_Contact_Form_Inline { $customRecId = CRM_Utils_Request::retrieve('customRecId', 'Positive', $this, FALSE, 1, $_REQUEST); $cgcount = CRM_Utils_Request::retrieve('cgcount', 'Positive', $this, FALSE, 1, $_REQUEST); $subType = CRM_Contact_BAO_Contact::getContactSubType($this->_contactId, ','); - CRM_Custom_Form_CustomData::preProcess($this, null, $subType, $cgcount, + CRM_Custom_Form_CustomData::preProcess($this, NULL, $subType, $cgcount, $this->_contactType, $this->_contactId); } diff --git a/CRM/Contact/Form/Inline/Phone.php b/CRM/Contact/Form/Inline/Phone.php index 9edd86d248..6634723a92 100644 --- a/CRM/Contact/Form/Inline/Phone.php +++ b/CRM/Contact/Form/Inline/Phone.php @@ -108,7 +108,7 @@ class CRM_Contact_Form_Inline_Phone extends CRM_Contact_Form_Inline { public static function formRule($fields, $errors) { $hasData = $hasPrimary = $errors = array(); if (!empty($fields['phone']) && is_array($fields['phone'])) { - $primaryID = null; + $primaryID = NULL; foreach ($fields['phone'] as $instance => $blockValues) { $dataExists = CRM_Contact_Form_Contact::blockDataExists($blockValues); diff --git a/CRM/Contact/Form/ProfileContact.php b/CRM/Contact/Form/ProfileContact.php index 8029c7a7f8..2dd022f0b2 100644 --- a/CRM/Contact/Form/ProfileContact.php +++ b/CRM/Contact/Form/ProfileContact.php @@ -113,7 +113,7 @@ class CRM_Contact_Form_ProfileContact { public static function postProcess($form) { $params = $form->_params; if (!empty($form->_honor_block_is_active) && !empty($params['soft_credit_type_id'])) { - $honorId = null; + $honorId = NULL; //check if there is any duplicate contact $profileContactType = CRM_Core_BAO_UFGroup::getContactType($params['honoree_profile_id']); diff --git a/CRM/Contact/Form/Search.php b/CRM/Contact/Form/Search.php index 388be6def6..66c096b2d8 100644 --- a/CRM/Contact/Form/Search.php +++ b/CRM/Contact/Form/Search.php @@ -668,7 +668,7 @@ class CRM_Contact_Form_Search extends CRM_Core_Form_Search { $selector = new self::$_selectorName( $this->_params, $this->_action, - null, false, null, + NULL, false, NULL, "search", "advanced" ); } @@ -810,9 +810,9 @@ class CRM_Contact_Form_Search extends CRM_Core_Form_Search { $selector = new self::$_selectorName ( $this->_params, $this->_action, - null, + NULL, false, - null, + NULL, "search", "advanced" ); @@ -851,7 +851,7 @@ class CRM_Contact_Form_Search extends CRM_Core_Form_Search { } /** - * @return null + * @return NULL */ public function &returnProperties() { return CRM_Core_DAO::$_nullObject; diff --git a/CRM/Contact/Form/Search/Builder.php b/CRM/Contact/Form/Search/Builder.php index 6fa6341da8..cfe0504ae4 100644 --- a/CRM/Contact/Form/Search/Builder.php +++ b/CRM/Contact/Form/Search/Builder.php @@ -468,7 +468,7 @@ class CRM_Contact_Form_Search_Builder extends CRM_Contact_Form_Search { * CRM-10338 * tags and groups use array keys for selection list. * if using IS NULL/NOT NULL, an array with no array key is created - * convert that to simple null so processing can proceed + * convert that to simple NULL so processing can proceed */ public static function checkArrayKeyEmpty($val) { if (is_array($val)) { @@ -479,7 +479,7 @@ class CRM_Contact_Form_Search_Builder extends CRM_Contact_Form_Search { } } if ($v2empty) { - $val = null; + $val = NULL; } } return $val; diff --git a/CRM/Contact/Form/Search/Custom/Group.php b/CRM/Contact/Form/Search/Custom/Group.php index 131c338a2f..07d55c8034 100644 --- a/CRM/Contact/Form/Search/Custom/Group.php +++ b/CRM/Contact/Form/Search/Custom/Group.php @@ -179,7 +179,7 @@ class CRM_Contact_Form_Search_Custom_Group /** * @param int $offset * @param int $rowcount - * @param null $sort + * @param NULL $sort * @param bool $includeContactIDs * @param bool $justIDs * @@ -229,7 +229,7 @@ class CRM_Contact_Form_Search_Custom_Group // adding a groupBy clause and saving it as a smart group messes up the query and // bad things happen // andrew hunt seemed to have rewritten this piece when he worked on this search - $groupBy = null; + $groupBy = NULL; } $sql = "SELECT $selectClause $from WHERE $where $groupBy"; @@ -608,7 +608,7 @@ WHERE gcc.group_id = {$ssGroup->id} /** * @param int $offset * @param int $rowcount - * @param null $sort + * @param NULL $sort * @param bool $returnSQL * * @return string @@ -625,7 +625,7 @@ WHERE gcc.group_id = {$ssGroup->id} } /** - * @return null + * @return NULL */ public function summary() { return NULL; diff --git a/CRM/Contribute/BAO/Query.php b/CRM/Contribute/BAO/Query.php index fabb0ed330..afec1c9728 100644 --- a/CRM/Contribute/BAO/Query.php +++ b/CRM/Contribute/BAO/Query.php @@ -689,7 +689,7 @@ class CRM_Contribute_BAO_Query { * @param $mode * @param $side * - * @return null|string + * @return NULL|string */ public static function from($name, $mode, $side) { $from = NULL; @@ -896,7 +896,7 @@ class CRM_Contribute_BAO_Query { * @param $mode * @param bool $includeCustomFields * - * @return array|null + * @return array|NULL */ public static function defaultReturnProperties($mode, $includeCustomFields = TRUE) { $properties = NULL; diff --git a/CRM/Contribute/Form/AdditionalInfo.php b/CRM/Contribute/Form/AdditionalInfo.php index d69fc40fed..f59759cb79 100644 --- a/CRM/Contribute/Form/AdditionalInfo.php +++ b/CRM/Contribute/Form/AdditionalInfo.php @@ -197,7 +197,7 @@ class CRM_Contribute_Form_AdditionalInfo { * @param array $params * @param int $contributionID * @param int $premiumID - * @param null $options + * @param NULL $options * @return void */ public static function processPremium(&$params, $contributionID, $premiumID = NULL, &$options = NULL) { diff --git a/CRM/Core/BAO/FinancialTrxn.php b/CRM/Core/BAO/FinancialTrxn.php index 170c4d7700..e59cea439c 100644 --- a/CRM/Core/BAO/FinancialTrxn.php +++ b/CRM/Core/BAO/FinancialTrxn.php @@ -58,7 +58,7 @@ class CRM_Core_BAO_FinancialTrxn extends CRM_Financial_DAO_FinancialTrxn { * @return CRM_Core_BAO_FinancialTrxn object * @static */ - public static function create(&$params, $trxnEntityTable = null) { + public static function create(&$params, $trxnEntityTable = NULL) { $trxn = new CRM_Financial_DAO_FinancialTrxn(); $trxn->copyValues($params); $fids = array(); @@ -137,7 +137,7 @@ class CRM_Core_BAO_FinancialTrxn extends CRM_Financial_DAO_FinancialTrxn { CRM_Core_DAO::storeValues($financialItem, $defaults); return $financialItem; } - return null; + return NULL; } /** @@ -288,7 +288,7 @@ WHERE lt.entity_id = %1 "; return $result; } else { - return null; + return NULL; } } @@ -425,9 +425,9 @@ WHERE ceft.entity_id = %1"; * @param int $entityId * @param string $entityName * @param bool $returnType - * @param null $lineItemTotal + * @param NULL $lineItemTotal * - * @return array|int|null|string + * @return array|int|NULL|string */ public static function getPartialPaymentWithType($entityId, $entityName = 'participant', $returnType = TRUE, $lineItemTotal = NULL) { $value = NULL; diff --git a/CRM/Core/BAO/Mapping.php b/CRM/Core/BAO/Mapping.php index 0877c23b28..e6bc7d2821 100644 --- a/CRM/Core/BAO/Mapping.php +++ b/CRM/Core/BAO/Mapping.php @@ -49,7 +49,7 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { * @param array $defaults * (reference ) an assoc array to hold the flattened values. * - * @return object CRM_Core_DAO_Mapping object on success, otherwise null + * @return object CRM_Core_DAO_Mapping object on success, otherwise NULL * @static */ public static function retrieve(&$params, &$defaults) { @@ -100,7 +100,7 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { * @param array $params * An array of name/value pairs. * - * @return object CRM_Core_DAO_Mapper object on success, otherwise null + * @return object CRM_Core_DAO_Mapper object on success, otherwise NULL * @static */ public static function add($params) { @@ -248,7 +248,7 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { * @param int $columnNo * @param int $blockCount * (no of blocks shown). - * @param null $exportMode + * @param NULL $exportMode * * @return void * @static @@ -1156,7 +1156,7 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { * @param int $mappingId * Mapping id. * - * @return null + * @return NULL * @static */ public static function saveMappingFields(&$params, $mappingId) { diff --git a/CRM/Core/BAO/MessageTemplate.php b/CRM/Core/BAO/MessageTemplate.php index d7d27dac89..a205b8cfab 100644 --- a/CRM/Core/BAO/MessageTemplate.php +++ b/CRM/Core/BAO/MessageTemplate.php @@ -69,7 +69,7 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate { * @param bool $is_active * Value we want to set the is_active field. * - * @return Object DAO object on sucess, null otherwise + * @return Object DAO object on sucess, NULL otherwise * @static */ public static function setIsActive($id, $is_active) { @@ -160,7 +160,7 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate { * @param int $messageTemplateID * @param $from * - * @return bool|null + * @return bool|NULL */ public static function sendReminder($contactId, $email, $messageTemplateID, $from) { @@ -205,7 +205,7 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate { } list($details) = CRM_Utils_Token::getTokenDetails(array($contactId), $returnProperties, - null, null, false, + NULL, NULL, false, $tokens, 'CRM_Core_BAO_MessageTemplate'); $contact = reset($details); diff --git a/CRM/Core/BAO/Navigation.php b/CRM/Core/BAO/Navigation.php index 7fb4aa0e52..227c9ac743 100644 --- a/CRM/Core/BAO/Navigation.php +++ b/CRM/Core/BAO/Navigation.php @@ -52,7 +52,7 @@ class CRM_Core_BAO_Navigation extends CRM_Core_DAO_Navigation { * @param bool $is_active * Value we want to set the is_active field. * - * @return Object DAO object on sucess, null otherwise + * @return Object DAO object on sucess, NULL otherwise * * @static */ @@ -130,7 +130,7 @@ class CRM_Core_BAO_Navigation extends CRM_Core_DAO_Navigation { * @param array $defaults * (reference ) an assoc array to hold the flattened values. * - * @return CRM_Core_BAO_Navigation object on success, null otherwise + * @return CRM_Core_BAO_Navigation object on success, NULL otherwise * @static */ public static function retrieve(&$params, &$defaults) { diff --git a/CRM/Core/BAO/Note.php b/CRM/Core/BAO/Note.php index d8ca0704a7..b683350309 100644 --- a/CRM/Core/BAO/Note.php +++ b/CRM/Core/BAO/Note.php @@ -50,7 +50,7 @@ class CRM_Core_BAO_Note extends CRM_Core_DAO_Note { * @param int $id * Id of the note to retrieve. * - * @return string the note text or null if note not found + * @return string the note text or NULL if note not found * * @static */ @@ -64,7 +64,7 @@ class CRM_Core_BAO_Note extends CRM_Core_DAO_Note { * @param int $id * Id of the note to retrieve. * - * @return string the note subject or null if note not found + * @return string the note subject or NULL if note not found * * @static */ @@ -289,7 +289,7 @@ class CRM_Core_BAO_Note extends CRM_Core_DAO_Note { * @param bool $showStatus * Do we need to set status or not. * - * @return mixed|null $return no of deleted notes on success, false otherwise@access public + * @return mixed|NULL $return no of deleted notes on success, false otherwise@access public * @static */ public static function del($id, $showStatus = TRUE) { diff --git a/CRM/Core/BAO/PrevNextCache.php b/CRM/Core/BAO/PrevNextCache.php index 5cef089046..499b20b868 100644 --- a/CRM/Core/BAO/PrevNextCache.php +++ b/CRM/Core/BAO/PrevNextCache.php @@ -43,8 +43,8 @@ class CRM_Core_BAO_PrevNextCache extends CRM_Core_DAO_PrevNextCache { * @param $id1 * @param $id2 * @param int $mergeId - * @param null $join - * @param null $where + * @param NULL $join + * @param NULL $where * @param bool $flip * * @return array @@ -113,7 +113,7 @@ WHERE cacheKey = %3 AND /** * @param int $id - * @param null $cacheKey + * @param NULL $cacheKey * @param string $entityTable */ public static function deleteItem($id = NULL, $cacheKey = NULL, $entityTable = 'civicrm_contact') { @@ -137,7 +137,7 @@ WHERE cacheKey = %3 AND /** * @param $id1 * @param $id2 - * @param null $cacheKey + * @param NULL $cacheKey * @param bool $isViceVersa * @param string $entityTable */ @@ -163,8 +163,8 @@ WHERE cacheKey = %3 AND /** * @param $cacheKey - * @param null $join - * @param null $where + * @param NULL $join + * @param NULL $where * @param int $offset * @param int $rowCount * @@ -227,8 +227,8 @@ WHERE cacheKey = %1 /** * @param $cacheKey - * @param null $join - * @param null $where + * @param NULL $join + * @param NULL $where * @param string $op * * @return int @@ -250,7 +250,7 @@ WHERE cacheKey $op %1 /** * @param int $rgid * @param int $gid - * @param null $cacheKeyString + * @param NULL $cacheKeyString */ public static function refillCache($rgid = NULL, $gid = NULL, $cacheKeyString = NULL) { if (!$cacheKeyString && $rgid) { diff --git a/CRM/Core/BAO/SchemaHandler.php b/CRM/Core/BAO/SchemaHandler.php index 1da5fcdb32..ada9528dbe 100644 --- a/CRM/Core/BAO/SchemaHandler.php +++ b/CRM/Core/BAO/SchemaHandler.php @@ -80,7 +80,7 @@ class CRM_Core_BAO_SchemaHandler { if ($config->logging) { // logging support $logging = new CRM_Logging_Schema; - $logging->fixSchemaDifferencesFor($params['name'], null, FALSE); + $logging->fixSchemaDifferencesFor($params['name'], NULL, FALSE); } // always do a trigger rebuild for this table @@ -164,7 +164,7 @@ class CRM_Core_BAO_SchemaHandler { * @param $separator * @param $prefix * - * @return null|string + * @return NULL|string */ public static function buildPrimaryKeySQL(&$params, $separator, $prefix) { $sql = NULL; @@ -183,7 +183,7 @@ class CRM_Core_BAO_SchemaHandler { * @param $prefix * @param bool $indexExist * - * @return null|string + * @return NULL|string */ public static function buildSearchIndexSQL(&$params, $separator, $prefix, $indexExist = FALSE) { $sql = NULL; @@ -277,7 +277,7 @@ ALTER TABLE {$tableName} * @param $prefix * @param string $tableName * - * @return null|string + * @return NULL|string */ public static function buildForeignKeySQL(&$params, $separator, $prefix, $tableName) { $sql = NULL; diff --git a/CRM/Core/I18n/SchemaStructure_4_2_alpha1.php b/CRM/Core/I18n/SchemaStructure_4_2_alpha1.php index f478485942..216e8d13df 100644 --- a/CRM/Core/I18n/SchemaStructure_4_2_alpha1.php +++ b/CRM/Core/I18n/SchemaStructure_4_2_alpha1.php @@ -38,7 +38,7 @@ class CRM_Core_I18n_SchemaStructure_4_2_alpha1 */ public static function &columns() { - static $result = null; + static $result = NULL; if (!$result) { $result = array( 'civicrm_location_type' => array( @@ -187,7 +187,7 @@ class CRM_Core_I18n_SchemaStructure_4_2_alpha1 */ public static function &indices() { - static $result = null; + static $result = NULL; if (!$result) { $result = array( 'civicrm_custom_group' => array( @@ -229,7 +229,7 @@ class CRM_Core_I18n_SchemaStructure_4_2_alpha1 */ public static function &tables() { - static $result = null; + static $result = NULL; if (!$result) { $result = array_keys(self::columns()); } diff --git a/CRM/Core/I18n/SchemaStructure_4_3_1.php b/CRM/Core/I18n/SchemaStructure_4_3_1.php index 873dd7a80b..537196f575 100644 --- a/CRM/Core/I18n/SchemaStructure_4_3_1.php +++ b/CRM/Core/I18n/SchemaStructure_4_3_1.php @@ -38,7 +38,7 @@ class CRM_Core_I18n_SchemaStructure_4_3_1 */ public static function &columns() { - static $result = null; + static $result = NULL; if (!$result) { $result = array( 'civicrm_location_type' => array( @@ -192,7 +192,7 @@ class CRM_Core_I18n_SchemaStructure_4_3_1 */ public static function &indices() { - static $result = null; + static $result = NULL; if (!$result) { $result = array( 'civicrm_custom_group' => array( @@ -234,7 +234,7 @@ class CRM_Core_I18n_SchemaStructure_4_3_1 */ public static function &tables() { - static $result = null; + static $result = NULL; if (!$result) { $result = array_keys(self::columns()); } diff --git a/CRM/Core/I18n/SchemaStructure_4_5_alpha1.php b/CRM/Core/I18n/SchemaStructure_4_5_alpha1.php index 390132ed39..8b336156db 100644 --- a/CRM/Core/I18n/SchemaStructure_4_5_alpha1.php +++ b/CRM/Core/I18n/SchemaStructure_4_5_alpha1.php @@ -37,7 +37,7 @@ class CRM_Core_I18n_SchemaStructure_4_5_alpha1 { * @return array */ public static function &columns() { - static $result = null; + static $result = NULL; if (!$result) { $result = array( 'civicrm_location_type' => array( @@ -191,7 +191,7 @@ class CRM_Core_I18n_SchemaStructure_4_5_alpha1 { */ public static function &indices() { - static $result = null; + static $result = NULL; if (!$result) { $result = array( 'civicrm_custom_group' => array( @@ -233,7 +233,7 @@ class CRM_Core_I18n_SchemaStructure_4_5_alpha1 { */ public static function &tables() { - static $result = null; + static $result = NULL; if (!$result) { $result = array_keys(self::columns()); } diff --git a/CRM/Core/I18n/SchemaStructure_4_5_beta2.php b/CRM/Core/I18n/SchemaStructure_4_5_beta2.php index 2cac3d0632..4c5b2b4650 100644 --- a/CRM/Core/I18n/SchemaStructure_4_5_beta2.php +++ b/CRM/Core/I18n/SchemaStructure_4_5_beta2.php @@ -36,7 +36,7 @@ class CRM_Core_I18n_SchemaStructure_4_5_beta2 { public static function &columns() { - static $result = null; + static $result = NULL; if (!$result) { $result = array( 'civicrm_location_type' => array( @@ -190,7 +190,7 @@ class CRM_Core_I18n_SchemaStructure_4_5_beta2 } public static function &indices() { - static $result = null; + static $result = NULL; if (!$result) { $result = array( 'civicrm_custom_group' => array( @@ -228,7 +228,7 @@ class CRM_Core_I18n_SchemaStructure_4_5_beta2 } public static function &tables() { - static $result = null; + static $result = NULL; if (!$result) { $result = array_keys(self::columns()); } diff --git a/CRM/Core/Invoke.php b/CRM/Core/Invoke.php index 7f52c37c79..667b9c8ea4 100644 --- a/CRM/Core/Invoke.php +++ b/CRM/Core/Invoke.php @@ -299,7 +299,7 @@ class CRM_Core_Invoke { $addSequence = $addSequence ? 'true' : 'false'; unset($pageArgs['addSequence']); } - $object = new $item['page_callback'] ($title, true, $mode, null, $addSequence); + $object = new $item['page_callback'] ($title, true, $mode, NULL, $addSequence); } else { CRM_Core_Error::fatal(); diff --git a/CRM/Logging/Differ.php b/CRM/Logging/Differ.php index abd7ae4567..e01fde6b67 100644 --- a/CRM/Logging/Differ.php +++ b/CRM/Logging/Differ.php @@ -73,7 +73,7 @@ class CRM_Logging_Differ { * * @return array */ - public function diffsInTable($table, $contactID = null) { + public function diffsInTable($table, $contactID = NULL) { $diffs = array(); $params = array( -- 2.25.1