From 32519aca34f683d892937e9e87526734748f97a2 Mon Sep 17 00:00:00 2001 From: eileen Date: Wed, 3 Jun 2020 09:47:47 +1200 Subject: [PATCH] Remove last reference to Payment->_processorName in core & remove from processors I left it on Core_Payment to keep the deprecation notice visible --- CRM/Contribute/Form/UpdateBilling.php | 6 +++--- CRM/Core/Payment.php | 2 +- CRM/Core/Payment/AuthorizeNet.php | 1 - CRM/Core/Payment/Dummy.php | 1 - CRM/Core/Payment/Elavon.php | 1 - CRM/Core/Payment/PayJunction.php | 1 - CRM/Core/Payment/PayPalImpl.php | 13 ------------- CRM/Core/Payment/PayflowPro.php | 1 - CRM/Core/Payment/PaymentExpress.php | 1 - CRM/Core/Payment/Realex.php | 1 - CRM/Core/Payment/eWAY.php | 1 - 11 files changed, 4 insertions(+), 25 deletions(-) diff --git a/CRM/Contribute/Form/UpdateBilling.php b/CRM/Contribute/Form/UpdateBilling.php index 1370802e54..06486b2525 100644 --- a/CRM/Contribute/Form/UpdateBilling.php +++ b/CRM/Contribute/Form/UpdateBilling.php @@ -55,12 +55,12 @@ class CRM_Contribute_Form_UpdateBilling extends CRM_Contribute_Form_Contribution } if ((!$this->_crid && !$this->_coid && !$this->_mid) || (!$this->_subscriptionDetails)) { - CRM_Core_Error::fatal('Required information missing.'); + throw new CRM_Core_Exception('Required information missing.'); } if (!$this->_paymentProcessor['object']->supports('updateSubscriptionBillingInfo')) { - CRM_Core_Error::fatal(ts("%1 processor doesn't support updating subscription billing details.", - array(1 => $this->_paymentProcessor['object']->_processorName) + throw new CRM_Core_Exception(ts("%1 processor doesn't support updating subscription billing details.", + [1 => $this->_paymentProcessor['title']] )); } $this->assign('paymentProcessor', $this->_paymentProcessor); diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php index aec1fadf78..c4e4deb2c5 100644 --- a/CRM/Core/Payment.php +++ b/CRM/Core/Payment.php @@ -94,7 +94,7 @@ abstract class CRM_Core_Payment { /** * Processor type label. * - * (Deprecated parameter but used in some messages). + * (Deprecated unused parameter). * * @var string * @deprecated diff --git a/CRM/Core/Payment/AuthorizeNet.php b/CRM/Core/Payment/AuthorizeNet.php index 7f0c4f4fd2..03a1438a05 100644 --- a/CRM/Core/Payment/AuthorizeNet.php +++ b/CRM/Core/Payment/AuthorizeNet.php @@ -72,7 +72,6 @@ class CRM_Core_Payment_AuthorizeNet extends CRM_Core_Payment { public function __construct($mode, &$paymentProcessor) { $this->_mode = $mode; $this->_paymentProcessor = $paymentProcessor; - $this->_processorName = ts('Authorize.net'); $this->_setParam('apiLogin', $paymentProcessor['user_name']); $this->_setParam('paymentKey', $paymentProcessor['password']); diff --git a/CRM/Core/Payment/Dummy.php b/CRM/Core/Payment/Dummy.php index e0a079a8f1..c3535c6918 100644 --- a/CRM/Core/Payment/Dummy.php +++ b/CRM/Core/Payment/Dummy.php @@ -64,7 +64,6 @@ class CRM_Core_Payment_Dummy extends CRM_Core_Payment { public function __construct($mode, &$paymentProcessor) { $this->_mode = $mode; $this->_paymentProcessor = $paymentProcessor; - $this->_processorName = ts('Dummy Processor'); } /** diff --git a/CRM/Core/Payment/Elavon.php b/CRM/Core/Payment/Elavon.php index 0e63ded17d..2f9a140694 100644 --- a/CRM/Core/Payment/Elavon.php +++ b/CRM/Core/Payment/Elavon.php @@ -50,7 +50,6 @@ class CRM_Core_Payment_Elavon extends CRM_Core_Payment { // live or test $this->_mode = $mode; $this->_paymentProcessor = $paymentProcessor; - $this->_processorName = ts('Elavon'); } /** diff --git a/CRM/Core/Payment/PayJunction.php b/CRM/Core/Payment/PayJunction.php index 646421ee03..4fe0512979 100644 --- a/CRM/Core/Payment/PayJunction.php +++ b/CRM/Core/Payment/PayJunction.php @@ -43,7 +43,6 @@ class CRM_Core_Payment_PayJunction extends CRM_Core_Payment { public function __construct($mode, &$paymentProcessor) { $this->_mode = $mode; $this->_paymentProcessor = $paymentProcessor; - $this->_processorName = ts('PayJunction'); } /** diff --git a/CRM/Core/Payment/PayPalImpl.php b/CRM/Core/Payment/PayPalImpl.php index 092ef82ec0..022067bd98 100644 --- a/CRM/Core/Payment/PayPalImpl.php +++ b/CRM/Core/Payment/PayPalImpl.php @@ -43,19 +43,6 @@ class CRM_Core_Payment_PayPalImpl extends CRM_Core_Payment { public function __construct($mode, &$paymentProcessor) { $this->_mode = $mode; $this->_paymentProcessor = $paymentProcessor; - - if ($this->isPayPalType($this::PAYPAL_STANDARD)) { - $this->_processorName = ts('PayPal Standard'); - } - elseif ($this->isPayPalType($this::PAYPAL_EXPRESS)) { - $this->_processorName = ts('PayPal Express'); - } - elseif ($this->isPayPalType($this::PAYPAL_PRO)) { - $this->_processorName = ts('PayPal Pro'); - } - else { - throw new PaymentProcessorException('CRM_Core_Payment_PayPalImpl: Payment processor type is not defined!'); - } } /** diff --git a/CRM/Core/Payment/PayflowPro.php b/CRM/Core/Payment/PayflowPro.php index 662f6f9640..06355395bf 100644 --- a/CRM/Core/Payment/PayflowPro.php +++ b/CRM/Core/Payment/PayflowPro.php @@ -36,7 +36,6 @@ class CRM_Core_Payment_PayflowPro extends CRM_Core_Payment { // live or test $this->_mode = $mode; $this->_paymentProcessor = $paymentProcessor; - $this->_processorName = ts('Payflow Pro'); } /* diff --git a/CRM/Core/Payment/PaymentExpress.php b/CRM/Core/Payment/PaymentExpress.php index 643119444f..af2e876355 100644 --- a/CRM/Core/Payment/PaymentExpress.php +++ b/CRM/Core/Payment/PaymentExpress.php @@ -63,7 +63,6 @@ class CRM_Core_Payment_PaymentExpress extends CRM_Core_Payment { $this->_mode = $mode; $this->_paymentProcessor = $paymentProcessor; - $this->_processorName = ts('DPS Payment Express'); } /** diff --git a/CRM/Core/Payment/Realex.php b/CRM/Core/Payment/Realex.php index 8100aa9531..fad410d3be 100644 --- a/CRM/Core/Payment/Realex.php +++ b/CRM/Core/Payment/Realex.php @@ -65,7 +65,6 @@ class CRM_Core_Payment_Realex extends CRM_Core_Payment { public function __construct($mode, &$paymentProcessor) { $this->_mode = $mode; $this->_paymentProcessor = $paymentProcessor; - $this->_processorName = ts('Realex'); $this->_setParam('merchant_ref', $paymentProcessor['user_name']); $this->_setParam('secret', $paymentProcessor['password']); diff --git a/CRM/Core/Payment/eWAY.php b/CRM/Core/Payment/eWAY.php index ba52b0f8a0..d0a369ea88 100644 --- a/CRM/Core/Payment/eWAY.php +++ b/CRM/Core/Payment/eWAY.php @@ -126,7 +126,6 @@ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { // live or test $this->_mode = $mode; $this->_paymentProcessor = $paymentProcessor; - $this->_processorName = ts('eWay'); } /** -- 2.25.1