From 95179d8a26546cad1e1db49fd4686382b0293f65 Mon Sep 17 00:00:00 2001 From: eileen Date: Tue, 4 Aug 2020 12:43:40 +1200 Subject: [PATCH] [REF] Do not pass by reference to the recur function This is called twice (from with the same file). In both cases the calling function exits straight after without using or returning the value and the calling function has not itself received them by reference --- CRM/Core/Payment/PayPalProIPN.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/CRM/Core/Payment/PayPalProIPN.php b/CRM/Core/Payment/PayPalProIPN.php index 3df5e9c5e7..e5c58d3de7 100644 --- a/CRM/Core/Payment/PayPalProIPN.php +++ b/CRM/Core/Payment/PayPalProIPN.php @@ -145,16 +145,19 @@ class CRM_Core_Payment_PayPalProIPN extends CRM_Core_Payment_BaseIPN { /** * Process recurring contributions. + * * @param array $input * @param array $ids * @param array $objects * @param bool $first - * @return void + * + * @throws \CRM_Core_Exception + * @throws \CiviCRM_API3_Exception */ - public function recur(&$input, &$ids, &$objects, $first) { + public function recur($input, $ids, $objects, $first) { if (!isset($input['txnType'])) { Civi::log()->debug('PayPalProIPN: Could not find txn_type in input request.'); - echo "Failure: Invalid parameters

"; + echo 'Failure: Invalid parameters

'; return; } @@ -165,7 +168,7 @@ class CRM_Core_Payment_PayPalProIPN extends CRM_Core_Payment_BaseIPN { // the contribution record if ($recur->invoice_id != $input['invoice']) { Civi::log()->debug('PayPalProIPN: Invoice values dont match between database and IPN request recur is ' . $recur->invoice_id . ' input is ' . $input['invoice']); - echo "Failure: Invoice values dont match between database and IPN request recur is " . $recur->invoice_id . " input is " . $input['invoice']; + echo 'Failure: Invoice values dont match between database and IPN request recur is ' . $recur->invoice_id . " input is " . $input['invoice']; return; } @@ -345,7 +348,7 @@ class CRM_Core_Payment_PayPalProIPN extends CRM_Core_Payment_BaseIPN { } $status = $input['paymentStatus']; - if ($status == 'Denied' || $status == 'Failed' || $status == 'Voided') { + if ($status === 'Denied' || $status === 'Failed' || $status === 'Voided') { $this->failed($objects); return; } @@ -353,7 +356,7 @@ class CRM_Core_Payment_PayPalProIPN extends CRM_Core_Payment_BaseIPN { Civi::log()->debug('Returning since contribution status is Pending'); return; } - elseif ($status == 'Refunded' || $status == 'Reversed') { + elseif ($status === 'Refunded' || $status === 'Reversed') { $this->cancelled($objects); return; } -- 2.25.1