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

Remove more uses of CRM_Core_DAO::$_nullArray that are unncessary #14564

Merged
merged 2 commits into from
Jun 17, 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
4 changes: 2 additions & 2 deletions CRM/Contact/BAO/Contact.php
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ public static function &create(&$params, $fixAddress = TRUE, $invokeHooks = TRUE
'subject' => CRM_Utils_Array::value('subject', $note),
'contact_id' => $contactId,
);
CRM_Core_BAO_Note::add($noteParams, CRM_Core_DAO::$_nullArray);
CRM_Core_BAO_Note::add($noteParams);
}
}
else {
Expand All @@ -386,7 +386,7 @@ public static function &create(&$params, $fixAddress = TRUE, $invokeHooks = TRUE
'subject' => CRM_Utils_Array::value('subject', $params),
'contact_id' => $contactId,
);
CRM_Core_BAO_Note::add($noteParams, CRM_Core_DAO::$_nullArray);
CRM_Core_BAO_Note::add($noteParams);
}
}

Expand Down
2 changes: 1 addition & 1 deletion CRM/Contact/BAO/Relationship.php
Original file line number Diff line number Diff line change
Expand Up @@ -1751,7 +1751,7 @@ public static function relatedMemberships($contactId, &$params, $ids, $action =
AND is_current_member = 1";
$result = CRM_Core_DAO::singleValueQuery($query);
if ($result < CRM_Utils_Array::value('max_related', $membershipValues, PHP_INT_MAX)) {
CRM_Member_BAO_Membership::create($membershipValues, CRM_Core_DAO::$_nullArray);
CRM_Member_BAO_Membership::create($membershipValues);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion CRM/Contact/Page/Inline/Website.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public function run() {
$websiteTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Website', 'website_type_id');

$params = ['contact_id' => $contactId];
$websites = CRM_Core_BAO_Website::getValues($params, CRM_Core_DAO::$_nullArray);
$websites = CRM_Core_BAO_Website::getValues($params);
if (!empty($websites)) {
foreach ($websites as $key => & $value) {
$value['website_type'] = $websiteTypes[$value['website_type_id']];
Expand Down
2 changes: 1 addition & 1 deletion CRM/Contribute/BAO/Contribution.php
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ public static function lookupValue(&$defaults, $property, &$lookup, $reverse) {
*
* @return CRM_Contribute_BAO_Contribution
*/
public static function retrieve(&$params, &$defaults, &$ids) {
public static function retrieve(&$params, &$defaults = [], &$ids = []) {
$contribution = CRM_Contribute_BAO_Contribution::getValues($params, $defaults, $ids);
return $contribution;
}
Expand Down
3 changes: 2 additions & 1 deletion CRM/Contribute/BAO/ContributionSoft.php
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,9 @@ public static function formatSoftCreditParams(&$params, &$form) {
$honorId = CRM_Utils_Array::value(0, $ids);
}

$null = [];
$honorId = CRM_Contact_BAO_Contact::createProfileContact(
$params['honor'], CRM_Core_DAO::$_nullArray,
$params['honor'], $null,
$honorId, NULL,
$form->_values['honoree_profile_id']
);
Expand Down
2 changes: 1 addition & 1 deletion CRM/Core/BAO/Website.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public static function del($id) {
*
* @return bool
*/
public static function &getValues(&$params, &$values) {
public static function &getValues(&$params = [], &$values = []) {
$websites = [];
$website = new CRM_Core_DAO_Website();
$website->contact_id = $params['contact_id'];
Expand Down
2 changes: 1 addition & 1 deletion CRM/Event/BAO/Participant.php
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public static function &add(&$params) {
*
* @return CRM_Event_BAO_Participant|null the found object or null
*/
public static function getValues(&$params, &$values, &$ids) {
public static function getValues(&$params, &$values = [], &$ids = []) {
if (empty($params)) {
return NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion CRM/Event/Form/ParticipantFeeSelection.php
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ public function postProcess() {
// email sending
if (!empty($params['send_receipt'])) {
$fetchParticipantVals = ['id' => $this->_participantId];
CRM_Event_BAO_Participant::getValues($fetchParticipantVals, $participantDetails, CRM_Core_DAO::$_nullArray);
CRM_Event_BAO_Participant::getValues($fetchParticipantVals, $participantDetails);
$participantParams = array_merge($params, $participantDetails[$this->_participantId]);
$mailSent = $this->emailReceipt($participantParams);
}
Expand Down
2 changes: 1 addition & 1 deletion CRM/Financial/BAO/FinancialTypeAccount.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function __construct() {
*
* @return CRM_Contribute_BAO_ContributionType
*/
public static function retrieve(&$params, &$defaults, &$allValues = []) {
public static function retrieve(&$params, &$defaults = [], &$allValues = []) {
$financialTypeAccount = new CRM_Financial_DAO_EntityFinancialAccount();
$financialTypeAccount->copyValues($params);
$financialTypeAccount->find();
Expand Down
2 changes: 1 addition & 1 deletion CRM/Financial/BAO/Payment.php
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ public static function recordPayment($contributionId, $trxnData, $participantId)
protected static function getContributionAndParamsInFormatForRecordFinancialTransaction($contributionId) {
$getInfoOf['id'] = $contributionId;
$defaults = [];
$contributionDAO = CRM_Contribute_BAO_Contribution::retrieve($getInfoOf, $defaults, CRM_Core_DAO::$_nullArray);
$contributionDAO = CRM_Contribute_BAO_Contribution::retrieve($getInfoOf, $defaults);

// build params for recording financial trxn entry
$params['contribution'] = $contributionDAO;
Expand Down
3 changes: 2 additions & 1 deletion CRM/Financial/Page/FinancialType.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ public function browse() {

$params['entity_id'] = $dao->id;
$params['entity_table'] = 'civicrm_financial_type';
CRM_Financial_BAO_FinancialTypeAccount::retrieve($params, CRM_Core_DAO::$_nullArray, $financialAccountIds);
$null = [];
CRM_Financial_BAO_FinancialTypeAccount::retrieve($params, $null, $financialAccountIds);

foreach ($financialAccountIds as $key => $values) {
if (!empty($financialAccounts[$values['financial_account_id']])) {
Expand Down
2 changes: 1 addition & 1 deletion CRM/Member/BAO/Membership.php
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ public static function &getValues(&$params, &$values, $active = FALSE, $relatedM
*
* @return CRM_Member_BAO_Membership|CRM_Core_Error
*/
public static function create(&$params, &$ids, $skipRedirect = FALSE) {
public static function create(&$params, &$ids = [], $skipRedirect = FALSE) {
// always calculate status if is_override/skipStatusCal is not true.
// giving respect to is_override during import. CRM-4012

Expand Down
4 changes: 2 additions & 2 deletions CRM/Price/BAO/LineItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public static function create(&$params) {
*
* @return CRM_Price_BAO_LineItem
*/
public static function retrieve(&$params, &$defaults) {
public static function retrieve(&$params = [], &$defaults = []) {
$lineItem = new CRM_Price_BAO_LineItem();
$lineItem->copyValues($params);
if ($lineItem->find(TRUE)) {
Expand Down Expand Up @@ -1277,7 +1277,7 @@ protected function addFinancialItemsOnLineItemChange($isCreateAdditionalFinancia
$tempFinancialTrxnID = ['id' => $adjustedTrxn->id];
}
}
$lineObj = CRM_Price_BAO_LineItem::retrieve($lineParams, CRM_Core_DAO::$_nullArray);
$lineObj = CRM_Price_BAO_LineItem::retrieve($lineParams);
// insert financial items
// ensure entity_financial_trxn table has a linking of it.
CRM_Financial_BAO_FinancialItem::add($lineObj, $updatedContribution, NULL, $tempFinancialTrxnID);
Expand Down
4 changes: 1 addition & 3 deletions CRM/Utils/Mail/Incoming.php
Original file line number Diff line number Diff line change
Expand Up @@ -497,9 +497,7 @@ public static function getContactID($email, $name = NULL, $create = TRUE, &$mail

CRM_Utils_String::extractName($name, $params);

return CRM_Contact_BAO_Contact::createProfileContact($params,
CRM_Core_DAO::$_nullArray
);
return CRM_Contact_BAO_Contact::createProfileContact($params);
}

}
2 changes: 1 addition & 1 deletion CRM/Utils/String.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ public static function regex($str, $regexRules) {
}
return $match;
}
return CRM_Core_DAO::$_nullArray;
return [];
}

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/phpunit/api/v3/ContributionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3764,7 +3764,7 @@ public function _addPaymentInstrument() {
'account_relationship' => $relationTypeId,
'financial_account_id' => 7,
);
CRM_Financial_BAO_FinancialTypeAccount::add($financialParams, CRM_Core_DAO::$_nullArray);
CRM_Financial_BAO_FinancialTypeAccount::add($financialParams);
$this->assertNotEmpty($optionValue['values'][$optionValue['id']]['value']);
return $optionValue['values'][$optionValue['id']]['value'];
}
Expand Down