From aea2495c3afd1f728761c44e9937a85bfb106461 Mon Sep 17 00:00:00 2001 From: Matthew Wire Date: Tue, 2 Jun 2020 14:55:35 +0100 Subject: [PATCH] Remove unused singleton from core payment processors --- CRM/Core/Payment/AuthorizeNet.php | 8 -------- CRM/Core/Payment/Dummy.php | 8 -------- CRM/Core/Payment/Elavon.php | 8 -------- CRM/Core/Payment/FirstData.php | 8 -------- CRM/Core/Payment/PayJunction.php | 8 -------- CRM/Core/Payment/PayflowPro.php | 8 -------- CRM/Core/Payment/PaymentExpress.php | 8 -------- CRM/Core/Payment/PaymentExpressIPN.php | 8 -------- CRM/Core/Payment/Realex.php | 8 -------- CRM/Core/Payment/eWAY.php | 8 -------- 10 files changed, 80 deletions(-) diff --git a/CRM/Core/Payment/AuthorizeNet.php b/CRM/Core/Payment/AuthorizeNet.php index 7f0c4f4fd2..43a6f86c35 100644 --- a/CRM/Core/Payment/AuthorizeNet.php +++ b/CRM/Core/Payment/AuthorizeNet.php @@ -51,14 +51,6 @@ class CRM_Core_Payment_AuthorizeNet extends CRM_Core_Payment { $this->guzzleClient = $guzzleClient; } - /** - * We only need one instance of this object. So we use the singleton - * pattern and cache the instance in this variable - * - * @var object - */ - static private $_singleton = NULL; - /** * Constructor. * diff --git a/CRM/Core/Payment/Dummy.php b/CRM/Core/Payment/Dummy.php index e0a079a8f1..5c19d8a9e7 100644 --- a/CRM/Core/Payment/Dummy.php +++ b/CRM/Core/Payment/Dummy.php @@ -43,14 +43,6 @@ class CRM_Core_Payment_Dummy extends CRM_Core_Payment { } } - /** - * We only need one instance of this object. So we use the singleton - * pattern and cache the instance in this variable - * - * @var object - */ - static private $_singleton = NULL; - /** * Constructor. * diff --git a/CRM/Core/Payment/Elavon.php b/CRM/Core/Payment/Elavon.php index 0e63ded17d..d7d78ac1fa 100644 --- a/CRM/Core/Payment/Elavon.php +++ b/CRM/Core/Payment/Elavon.php @@ -28,14 +28,6 @@ class CRM_Core_Payment_Elavon extends CRM_Core_Payment { const CHARSET = 'UFT-8'; - /** - * We only need one instance of this object. So we use the singleton - * pattern and cache the instance in this variable - * - * @var CRM_Core_Payment_Elavon - */ - static private $_singleton = NULL; - /** * Constructor. * diff --git a/CRM/Core/Payment/FirstData.php b/CRM/Core/Payment/FirstData.php index 860a4f6c87..5e520cf7e4 100644 --- a/CRM/Core/Payment/FirstData.php +++ b/CRM/Core/Payment/FirstData.php @@ -55,14 +55,6 @@ class CRM_Core_Payment_FirstData extends CRM_Core_Payment { // (not used, implicit in the API, might need to convert?) const CHARSET = 'UFT-8'; - /** - * We only need one instance of this object. So we use the singleton - * pattern and cache the instance in this variable - * - * @var object - */ - static private $_singleton = NULL; - /** * Constructor. * diff --git a/CRM/Core/Payment/PayJunction.php b/CRM/Core/Payment/PayJunction.php index 646421ee03..24cacaac73 100644 --- a/CRM/Core/Payment/PayJunction.php +++ b/CRM/Core/Payment/PayJunction.php @@ -22,14 +22,6 @@ class CRM_Core_Payment_PayJunction extends CRM_Core_Payment { // (not used, implicit in the API, might need to convert?) const CHARSET = 'UFT-8'; - /** - * We only need one instance of this object. So we use the singleton - * pattern and cache the instance in this variable - * - * @var object - */ - static private $_singleton = NULL; - /** * Constructor. * diff --git a/CRM/Core/Payment/PayflowPro.php b/CRM/Core/Payment/PayflowPro.php index 662f6f9640..96e0947e43 100644 --- a/CRM/Core/Payment/PayflowPro.php +++ b/CRM/Core/Payment/PayflowPro.php @@ -17,14 +17,6 @@ class CRM_Core_Payment_PayflowPro extends CRM_Core_Payment { const CHARSET = 'UFT-8'; - /** - * We only need one instance of this object. So we use the singleton - * pattern and cache the instance in this variable - * - * @var object - */ - static private $_singleton = NULL; - /** * Constructor * diff --git a/CRM/Core/Payment/PaymentExpress.php b/CRM/Core/Payment/PaymentExpress.php index 643119444f..1716dccfdf 100644 --- a/CRM/Core/Payment/PaymentExpress.php +++ b/CRM/Core/Payment/PaymentExpress.php @@ -41,14 +41,6 @@ class CRM_Core_Payment_PaymentExpress extends CRM_Core_Payment { protected $_mode = NULL; - /** - * We only need one instance of this object. So we use the singleton - * pattern and cache the instance in this variable - * - * @var object - */ - static private $_singleton = NULL; - /** * Constructor. * diff --git a/CRM/Core/Payment/PaymentExpressIPN.php b/CRM/Core/Payment/PaymentExpressIPN.php index 3fc3ed9528..878b948f96 100644 --- a/CRM/Core/Payment/PaymentExpressIPN.php +++ b/CRM/Core/Payment/PaymentExpressIPN.php @@ -38,14 +38,6 @@ */ class CRM_Core_Payment_PaymentExpressIPN extends CRM_Core_Payment_BaseIPN { - /** - * We only need one instance of this object. So we use the singleton - * pattern and cache the instance in this variable - * - * @var object - */ - static private $_singleton = NULL; - /** * Mode of operation: live or test * diff --git a/CRM/Core/Payment/Realex.php b/CRM/Core/Payment/Realex.php index 8100aa9531..d1834686cb 100644 --- a/CRM/Core/Payment/Realex.php +++ b/CRM/Core/Payment/Realex.php @@ -44,14 +44,6 @@ class CRM_Core_Payment_Realex extends CRM_Core_Payment { protected $_params = []; - /** - * We only need one instance of this object. So we use the singleton - * pattern and cache the instance in this variable - * - * @var object - */ - static private $_singleton = NULL; - /** * Constructor. * diff --git a/CRM/Core/Payment/eWAY.php b/CRM/Core/Payment/eWAY.php index ba52b0f8a0..f0fc635f93 100644 --- a/CRM/Core/Payment/eWAY.php +++ b/CRM/Core/Payment/eWAY.php @@ -102,14 +102,6 @@ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { // (not used, implicit in the API, might need to convert?) const CHARSET = 'UTF-8'; - /** - * We only need one instance of this object. So we use the singleton - * pattern and cache the instance in this variable - * - * @var object - */ - static private $_singleton = NULL; - /** * ******************************************************* * Constructor -- 2.25.1