From 0e89200f12cb71002f696ef36c40e0e3c02e645c Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 4 Jun 2020 19:00:54 +1200
Subject: [PATCH] [Ref] remove calls to, and deprecate, pending function
---
CRM/Core/Payment/BaseIPN.php | 7 +++++--
CRM/Core/Payment/PayPalIPN.php | 5 +++--
CRM/Core/Payment/PayPalProIPN.php | 4 ++--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php
index 2ad490ac4da..8f5dd3786fe 100644
--- a/CRM/Core/Payment/BaseIPN.php
+++ b/CRM/Core/Payment/BaseIPN.php
@@ -274,15 +274,18 @@ class CRM_Core_Payment_BaseIPN {
/**
* Handled pending contribution status.
*
+ * @deprecated
+ *
* @param array $objects
* @param object $transaction
*
* @return bool
*/
public function pending(&$objects, &$transaction) {
+ CRM_Core_Error::deprecatedFunctionWarning('This function will be removed at some point');
$transaction->commit();
- Civi::log()->debug("Returning since contribution status is Pending");
- echo "Success: Returning since contribution status is pending<p>";
+ Civi::log()->debug('Returning since contribution status is Pending');
+ echo 'Success: Returning since contribution status is pending<p>';
return TRUE;
}
diff --git a/CRM/Core/Payment/PayPalIPN.php b/CRM/Core/Payment/PayPalIPN.php
index a506ab3f297..0d3eae53867 100644
--- a/CRM/Core/Payment/PayPalIPN.php
+++ b/CRM/Core/Payment/PayPalIPN.php
@@ -263,8 +263,9 @@ class CRM_Core_Payment_PayPalIPN extends CRM_Core_Payment_BaseIPN {
if ($status == 'Denied' || $status == 'Failed' || $status == 'Voided') {
return $this->failed($objects, $transaction);
}
- elseif ($status == 'Pending') {
- return $this->pending($objects, $transaction);
+ if ($status === 'Pending') {
+ Civi::log()->debug('Returning since contribution status is Pending');
+ return;
}
elseif ($status == 'Refunded' || $status == 'Reversed') {
return $this->cancelled($objects, $transaction);
diff --git a/CRM/Core/Payment/PayPalProIPN.php b/CRM/Core/Payment/PayPalProIPN.php
index 46c0949f851..a2155527240 100644
--- a/CRM/Core/Payment/PayPalProIPN.php
+++ b/CRM/Core/Payment/PayPalProIPN.php
@@ -351,8 +351,8 @@ class CRM_Core_Payment_PayPalProIPN extends CRM_Core_Payment_BaseIPN {
$this->failed($objects, $transaction);
return;
}
- elseif ($status == 'Pending') {
- $this->pending($objects, $transaction);
+ if ($status === 'Pending') {
+ Civi::log()->debug('Returning since contribution status is Pending');
return;
}
elseif ($status == 'Refunded' || $status == 'Reversed') {
--
GitLab