From 667af2475245027a13c2a45089d5242ad59124fd Mon Sep 17 00:00:00 2001 From: eileen Date: Mon, 12 Oct 2020 10:07:40 +1300 Subject: [PATCH] dev/financial#152 simplify passed parameters the function now only requires so this simplifies so it only receives that --- CRM/Core/Payment/PayPalIPN.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CRM/Core/Payment/PayPalIPN.php b/CRM/Core/Payment/PayPalIPN.php index 6f600ccd1d..7c05eb696f 100644 --- a/CRM/Core/Payment/PayPalIPN.php +++ b/CRM/Core/Payment/PayPalIPN.php @@ -210,21 +210,20 @@ class CRM_Core_Payment_PayPalIPN extends CRM_Core_Payment_BaseIPN { 'related_contact' => $ids['related_contact'] ?? NULL, 'participant' => !empty($objects['participant']) ? $objects['participant']->id : NULL, 'contributionRecur' => !empty($objects['contributionRecur']) ? $objects['contributionRecur']->id : NULL, - ], $objects, TRUE); + ], $objects['contribution'], TRUE); } /** * @param array $input * @param array $ids - * @param array $objects + * @param \CRM_Contribute_BAO_Contribution $contribution * @param bool $recur * * @return void * @throws \CRM_Core_Exception * @throws \CiviCRM_API3_Exception */ - public function single($input, $ids, $objects, $recur = FALSE) { - $contribution = &$objects['contribution']; + public function single($input, $ids, $contribution, $recur = FALSE) { // make sure the invoice is valid and matches what we have in the contribution record if ($contribution->invoice_id != $input['invoice']) { @@ -252,7 +251,7 @@ class CRM_Core_Payment_PayPalIPN extends CRM_Core_Payment_BaseIPN { return; } - CRM_Contribute_BAO_Contribution::completeOrder($input, $ids, $objects['contribution']); + CRM_Contribute_BAO_Contribution::completeOrder($input, $ids, $contribution); } /** @@ -363,7 +362,7 @@ class CRM_Core_Payment_PayPalIPN extends CRM_Core_Payment_BaseIPN { 'related_contact' => $ids['related_contact'] ?? NULL, 'participant' => !empty($objects['participant']) ? $objects['participant']->id : NULL, 'contributionRecur' => !empty($objects['contributionRecur']) ? $objects['contributionRecur']->id : NULL, - ], $objects); + ], $objects['contribution']); } catch (CRM_Core_Exception $e) { Civi::log()->debug($e->getMessage()); -- 2.25.1