Skip to content

Remove calls to deprecated CRM_Utils_Array::value #286

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove calls to deprecated CRM_Utils_Array::value #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions CRM/Core/Payment/OmnipayMultiProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,8 @@ protected function initialize(&$params) {
$this->ensurePaymentProcessorTypeIsSet();
$this->createGatewayObject();
$this->setProcessorFields();
$this->setContributionReference(CRM_Utils_Array::value('contributionID', $params));
$this->storeReturnUrls(CRM_Utils_Array::value('participantID', $params), CRM_Utils_Array::value('eventID', $params));
$this->setContributionReference($params['contributionID'] ?? NULL);
$this->storeReturnUrls($params['participantID'] ?? $params['eventID'] ?? NULL);
}

/**
Expand Down Expand Up @@ -784,7 +784,7 @@ public function handlePaymentNotification() {
$params = array_merge($_GET, $_REQUEST);
if (empty($params['payment_processor_id'])) {
// CRM-16422 we need to be prepared for the payment processor id to be in the url instead.
$q = explode('/', CRM_Utils_Array::value('q', $params, ''));
$q = explode('/', $params['q'] ?? '');
$lastParam = array_pop($q);
if (is_numeric($lastParam)) {
$params['processor_id'] = $lastParam;
Expand Down Expand Up @@ -1541,7 +1541,7 @@ protected function doTokenPayment(&$params) {

// and, at least with Way rapid, the createCreditCard call ignores any attempt to authorise.
// that is likely to be a pattern.
$action = CRM_Utils_Array::value('payment_action', $params, 'purchase');
$action = $params['payment_action'] ?? 'purchase';
// This is a bit tricky. With Paypal there are 2 flows
// 1) you get a token from paypal checkout but there is no recurring - this token needs to be 'completed'
// 2) you have a recurring payment token that we can bill against. However, is_recur is not
Expand Down
2 changes: 1 addition & 1 deletion CRM/Core/Payment/PaymentExtended.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ protected function getPrefix() {
$processor = civicrm_api3('PaymentProcessor',
'getsingle', ['id' => $this->_paymentProcessor['id']]
);
return CRM_Utils_Array::value($paymentField['name'], $processor);
return $processor[$paymentField['name']] ?? NULL;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions api/v3/Job/ProcessRecurring.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ function civicrm_api3_job_process_recurring($params) {
$originalContribution = civicrm_api3('Contribution', 'getsingle', [
'contribution_recur_id' => $recurringPayment['id'],
'options' => ['limit' => 1],
'is_test' => CRM_Utils_Array::value('is_test', $recurringPayment['is_test']),
'contribution_test' => CRM_Utils_Array::value('is_test', $recurringPayment['is_test']),
'is_test' => $recurringPayment['is_test']['is_test'] ?? NULL,
'contribution_test' => $recurringPayment['is_test']['is_test'] ?? NULL,
]);
$result[$recurringPayment['id']]['original_contribution'] = $originalContribution;
$totalAmount = $recurringPayment['amount'] ?? $originalContribution['total_amount'];
Expand Down