Rename gateway instances service to deprecated

mollie · Dec 18, 2024 · e26ae66 · e26ae66
1 parent ed2e1e9
commit e26ae66
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 18 deletions.
diff --git a/src/Assets/AssetsModule.php b/src/Assets/AssetsModule.php
@@ -533,7 +533,7 @@ protected function setupModuleActions(ContainerInterface $container): void
         $pluginPath = $container->get('shared.plugin_path');
         /** @var Settings */
         $settingsHelper = $container->get('settings.settings_helper');
-        $gatewayInstances = $container->get('gateway.instances');
+        $gatewayInstances = $container->get('__deprecated.gateway_helpers');
 
         /** Add support to Mollie blocks for Woocommerce checkout blocks functionality */
         //https://github.com/woocommerce/woocommerce-blocks/blob/trunk/docs/third-party-developers/extensibility/checkout-payment-methods/payment-method-integration.md#putting-it-all-together
@@ -588,7 +588,7 @@ function () use ($container, $hasBlocksEnabled, $settingsHelper, $pluginUrl, $pl
 
                 if ($hasBlocksEnabled) {
                     /** @var array */
-                    $gatewayInstances = $container->get('gateway.instances');
+                    $gatewayInstances = $container->get('__deprecated.gateway_helpers');
                     self::registerBlockScripts($pluginUrl, $pluginPath);
                     add_action('wp_enqueue_scripts', function () use ($dataService, $gatewayInstances) {
                         $this->enqueueBlockCheckoutScripts($dataService, $gatewayInstances);

diff --git a/src/Gateway/GatewayModule.php b/src/Gateway/GatewayModule.php
@@ -131,8 +131,8 @@ static function () {
 
         // Set order to paid and processed when eventually completed without Mollie
         add_action('woocommerce_payment_complete', [$this, 'setOrderPaidByOtherGateway'], 10, 1);
-        $appleGateway = isset($container->get('gateway.instances')['mollie_wc_gateway_applepay']) ? $container->get(
-            'gateway.instances'
+        $appleGateway = isset($container->get('__deprecated.gateway_helpers')['mollie_wc_gateway_applepay']) ? $container->get(
+            '__deprecated.gateway_helpers'
         )['mollie_wc_gateway_applepay'] : false;
         $notice = $container->get(AdminNotice::class);
         assert($notice instanceof AdminNotice);
@@ -150,8 +150,8 @@ static function () {
             $this->mollieApplePayDirectHandling($notice, $logger, $apiHelper, $settingsHelper, $appleGateway);
         }
 
-        $paypalGateway = isset($container->get('gateway.instances')['mollie_wc_gateway_paypal']) ? $container->get(
-            'gateway.instances'
+        $paypalGateway = isset($container->get('__deprecated.gateway_helpers')['mollie_wc_gateway_paypal']) ? $container->get(
+            '__deprecated.gateway_helpers'
         )['mollie_wc_gateway_paypal'] : false;
         if ($paypalGateway) {
             $this->molliePayPalButtonHandling($paypalGateway, $notice, $logger, $pluginUrl);

diff --git a/src/Gateway/MolliePaymentGatewayHandler.php b/src/Gateway/MolliePaymentGatewayHandler.php
@@ -25,7 +25,7 @@
 use WC_Payment_Gateway;
 use WP_Error;
 
-class MolliePaymentGatewayHandler extends WC_Payment_Gateway implements MolliePaymentGatewayI
+class MolliePaymentGatewayHandler implements MolliePaymentGatewayI
 {
     /**
      * @var bool
@@ -86,7 +86,6 @@ class MolliePaymentGatewayHandler extends WC_Payment_Gateway implements MolliePa
      * @var string
      */
     protected $pluginId;
-    private RefundProcessor $refundProcessor;
 
     /**
      *

diff --git a/src/Gateway/Voucher/VoucherModule.php b/src/Gateway/Voucher/VoucherModule.php
@@ -58,7 +58,7 @@ public function services(): array
      */
     public function run(ContainerInterface $container): bool
     {
-        $gatewayInstances = $container->get('gateway.instances');
+        $gatewayInstances = $container->get('__deprecated.gateway_helpers');
         $voucherGateway = $gatewayInstances['mollie_wc_gateway_voucher'] ?? false;
         $voucher = $voucherGateway && $voucherGateway->enabled === 'yes';
 

diff --git a/src/Gateway/inc/services.php b/src/Gateway/inc/services.php
@@ -36,7 +36,7 @@
         'gateway.classnames' => static function (): array {
             return SharedDataDictionary::GATEWAY_CLASSNAMES;
         },
-        'gateway.instances' => static function (ContainerInterface $container): array {
+        '__deprecated.gateway_helpers' => static function (ContainerInterface $container): array {
             $oldGatewayBuilder = new OldGatewayBuilder();
             return $oldGatewayBuilder->instantiatePaymentMethodGateways($container);
         },
@@ -168,7 +168,7 @@
         },
         'payment_gateway.getRefundProcessor' => static function (ContainerInterface $container): callable {
             return static function (string $gatewayId) use ($container): RefundProcessor {
-                $oldGatewayInstances = $container->get('gateway.instances');
+                $oldGatewayInstances = $container->get('__deprecated.gateway_helpers');
 
                 if (!isset($oldGatewayInstances[$gatewayId])) {
                     return $container->get('payment_gateways.noop_refund_processor');
@@ -212,7 +212,7 @@
         },
         'payment_gateway.getOldGatewayInstances' => static function (ContainerInterface $container): callable {
             return static function () use ($container): array {
-                return $container->get('gateway.instances');
+                return $container->get('__deprecated.gateway_helpers');
             };
         },
         'gateway.subscriptionHooks' => static function (): array {
@@ -242,7 +242,7 @@
             return $container->get('payment_gateways.noop_payment_request_validator');
         };
         $dynamicServices["payment_gateway.$gatewayId.payment_processor"] = static function (ContainerInterface $container) use ($gatewayId): PaymentService {
-            $oldGatewayInstances = $container->get('gateway.instances');
+            $oldGatewayInstances = $container->get('__deprecated.gateway_helpers');
             $gateway = $oldGatewayInstances[$gatewayId];
             $paymentService = $container->get(PaymentService::class);
             $paymentService->setGateway($gateway);
@@ -279,7 +279,7 @@
             $methodId = substr($gatewayId, strrpos($gatewayId, '_') + 1);
             $paymentMethod = $paymentMethods[$methodId];
 
-            $oldGatewayInstances = $container->get('gateway.instances');
+            $oldGatewayInstances = $container->get('__deprecated.gateway_helpers');
             //not all payment methods have a gateway
             if (!isset($oldGatewayInstances[$gatewayId])) {
                 return new NoopPaymentFieldsRenderer();
@@ -318,7 +318,7 @@
             return empty($description) ? false : $description;
         };
         $dynamicServices["payment_gateway.$gatewayId.availability_callback"] = new Factory(
-            ['gateway.instances'],
+            ['__deprecated.gateway_helpers'],
             static function (array $gatewayInstances) use($gatewayId): callable {
                 return static function () use ($gatewayInstances, $gatewayId): bool {
                     return $gatewayInstances[$gatewayId]->is_available();

diff --git a/src/Payment/PaymentModule.php b/src/Payment/PaymentModule.php
@@ -245,7 +245,7 @@ public function onMollieReturn($container)
 
         $gateway = wc_get_payment_gateway_by_order($order);
         $orderId = $order->get_id();
-        $oldGatewayInstances = $container->get('gateway.instances');
+        $oldGatewayInstances = $container->get('__deprecated.gateway_helpers');
         $mollieGatewayHelper = $oldGatewayInstances[$gateway->id];
 
         if (!$gateway) {
@@ -312,7 +312,7 @@ public function onOrderDetails(WC_Order $order, ContainerInterface $container)
         }
 
 
-        $oldGatewayInstances = $container->get('gateway.instances');
+        $oldGatewayInstances = $container->get('__deprecated.gateway_helpers');
         $mollieGatewayHelper = $oldGatewayInstances[$gateway->id];
         $mollieGatewayHelper->displayInstructions($order);
     }

diff --git a/src/Settings/SettingsModule.php b/src/Settings/SettingsModule.php
@@ -146,7 +146,7 @@ function () use ($optionName, $defaultAdvancedOptions, $defaultComponentsOptions
             $this->maybeTestModeNotice();
         });
 
-        $gateways = $container->get('gateway.instances');
+        $gateways = $container->get('__deprecated.gateway_helpers');
         $isSDDGatewayEnabled = $container->get('gateway.isSDDGatewayEnabled');
         $this->initMollieSettingsPage($isSDDGatewayEnabled, $gateways, $pluginPath, $pluginUrl, $paymentMethods);
         add_action(