From e4407ea7fbe2f11e0b7d8b1c02bf18171e47003e Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 27 Aug 2021 16:06:20 +1200
Subject: [PATCH] Deprecate incorrect error return

---
 CRM/Contribute/Form/UpdateSubscription.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/CRM/Contribute/Form/UpdateSubscription.php b/CRM/Contribute/Form/UpdateSubscription.php
index 31e16f76cf..b5b37e84c1 100644
--- a/CRM/Contribute/Form/UpdateSubscription.php
+++ b/CRM/Contribute/Form/UpdateSubscription.php
@@ -14,6 +14,7 @@
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 
+use Civi\Payment\Exception\PaymentProcessorException;
 
 /**
  * This class generates form components generic to recurring contributions.
@@ -111,7 +112,7 @@ class CRM_Contribute_Form_UpdateSubscription extends CRM_Contribute_Form_Contrib
     $this->assign('editableScheduleFields', array_diff($this->editableScheduleFields, $alreadyHardCodedFields));
 
     if ($this->_subscriptionDetails->contact_id) {
-      list($this->_donorDisplayName, $this->_donorEmail) = CRM_Contact_BAO_Contact::getContactDetails($this->_subscriptionDetails->contact_id);
+      [$this->_donorDisplayName, $this->_donorEmail] = CRM_Contact_BAO_Contact::getContactDetails($this->_subscriptionDetails->contact_id);
     }
 
     CRM_Utils_System::setTitle(ts('Update Recurring Contribution'));
@@ -210,18 +211,16 @@ class CRM_Contribute_Form_UpdateSubscription extends CRM_Contribute_Form_Contrib
     if ($this->_paymentProcessorObj->supports('changeSubscriptionAmount')) {
       try {
         $updateSubscription = $this->_paymentProcessorObj->changeSubscriptionAmount($message, $params);
+        if ($updateSubscription instanceof CRM_Core_Error) {
+          CRM_Core_Error::deprecatedWarning('An exception should be thrown');
+          throw new PaymentProcessorException(ts('Could not update the Recurring contribution details'));
+        }
       }
-      catch (\Civi\Payment\Exception\PaymentProcessorException $e) {
+      catch (PaymentProcessorException $e) {
         CRM_Core_Error::statusBounce($e->getMessage());
       }
     }
-    if (is_a($updateSubscription, 'CRM_Core_Error')) {
-      CRM_Core_Error::displaySessionError($updateSubscription);
-      $status = ts('Could not update the Recurring contribution details');
-      $msgTitle = ts('Update Error');
-      $msgType = 'error';
-    }
-    elseif ($updateSubscription) {
+    if ($updateSubscription) {
       // Handle custom data
       $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params, $this->contributionRecurID, 'ContributionRecur');
       // save the changes
@@ -296,7 +295,7 @@ class CRM_Contribute_Form_UpdateSubscription extends CRM_Contribute_Form_Contrib
           $receiptFrom = "$domainValues[0] <$domainValues[1]>";
         }
 
-        list($donorDisplayName, $donorEmail) = CRM_Contact_BAO_Contact::getContactDetails($contactID);
+        [$donorDisplayName, $donorEmail] = CRM_Contact_BAO_Contact::getContactDetails($contactID);
 
         $tplParams = [
           'recur_frequency_interval' => $this->_subscriptionDetails->frequency_interval,
@@ -319,7 +318,7 @@ class CRM_Contribute_Form_UpdateSubscription extends CRM_Contribute_Form_Contrib
           'toName' => $donorDisplayName,
           'toEmail' => $donorEmail,
         ];
-        list($sent) = CRM_Core_BAO_MessageTemplate::sendTemplate($sendTemplateParams);
+        [$sent] = CRM_Core_BAO_MessageTemplate::sendTemplate($sendTemplateParams);
       }
     }
 
-- 
2.25.1