From fae44d958f731c63e25f2e4db0b88dbc20d470d2 Mon Sep 17 00:00:00 2001 From: Bradley Taylor Date: Sat, 11 Nov 2023 17:35:43 +0000 Subject: [PATCH] [REF][PHP8.2] Ensure _subscriptionDetails is consistently declared --- CRM/Contribute/Form/ContributionRecur.php | 8 ++++++++ CRM/Contribute/Form/UpdateBilling.php | 2 -- CRM/Contribute/Form/UpdateSubscription.php | 2 -- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CRM/Contribute/Form/ContributionRecur.php b/CRM/Contribute/Form/ContributionRecur.php index 7402e94cad..09fb3fd3c0 100644 --- a/CRM/Contribute/Form/ContributionRecur.php +++ b/CRM/Contribute/Form/ContributionRecur.php @@ -83,6 +83,14 @@ class CRM_Contribute_Form_ContributionRecur extends CRM_Core_Form { */ protected $selfService; + /** + * Used by `CRM_Contribute_Form_UpdateSubscription` + * + * @var CRM_Core_DAO + * @deprecated This is being set temporarily - we should eventually just use the getter fn. + */ + protected $_subscriptionDetails = NULL; + /** * Explicitly declare the entity api name. */ diff --git a/CRM/Contribute/Form/UpdateBilling.php b/CRM/Contribute/Form/UpdateBilling.php index b7e60559b0..97401469e0 100644 --- a/CRM/Contribute/Form/UpdateBilling.php +++ b/CRM/Contribute/Form/UpdateBilling.php @@ -21,8 +21,6 @@ class CRM_Contribute_Form_UpdateBilling extends CRM_Contribute_Form_ContributionRecur { protected $_mode = NULL; - protected $_subscriptionDetails = NULL; - public $_bltID = NULL; /** diff --git a/CRM/Contribute/Form/UpdateSubscription.php b/CRM/Contribute/Form/UpdateSubscription.php index 5ef8c01903..459dbcd818 100644 --- a/CRM/Contribute/Form/UpdateSubscription.php +++ b/CRM/Contribute/Form/UpdateSubscription.php @@ -25,8 +25,6 @@ use Civi\Payment\Exception\PaymentProcessorException; */ class CRM_Contribute_Form_UpdateSubscription extends CRM_Contribute_Form_ContributionRecur { - protected $_subscriptionDetails = NULL; - public $_paymentProcessor = NULL; public $_paymentProcessorObj = NULL; -- 2.25.1