Fix error on renaming

src/Assets/MollieCheckoutBlocksSupport.php

@@ -3,7 +3,7 @@
 namespace Mollie\WooCommerce\Assets;
 
 use Automattic\WooCommerce\Blocks\Payments\Integrations\AbstractPaymentMethodType;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\Gateway\MolliePaymentGatewayI;
 use Mollie\WooCommerce\PaymentMethods\PaymentMethodI;
 use Mollie\WooCommerce\Shared\Data;
@@ -114,7 +114,7 @@ public static function gatewayDataForWCBlocks(Data $dataService, array $gatewayI
         ];
         $gatewayData = [];
         $isSepaEnabled = isset($gatewayInstances['mollie_wc_gateway_directdebit']) && $gatewayInstances['mollie_wc_gateway_directdebit']->enabled === 'yes';
-        /** @var MolliePaymentGateway $gateway */
+        /** @var MolliePaymentGatewayHandler $gateway */
         foreach ($gatewayInstances as $gatewayKey => $gateway) {
             $method = $gateway->paymentMethod();
             $gatewayId = is_string($method->getProperty('id')) ? $method->getProperty('id') : "";

src/Gateway/GatewayModule.php

@@ -385,6 +385,78 @@ public function molliePayPalButtonHandling(
         }
     }
 
+    /**
+     * @param $container
+     * @return array
+     */
+    protected function instantiatePaymentMethods($container): array
+    {
+        $paymentMethods = [];
+        $listAllAvailablePaymentMethods = $container->get('gateway.getPaymentMethodsAfterFeatureFlag');
+        $iconFactory = $container->get(IconFactory::class);
+        assert($iconFactory instanceof IconFactory);
+        $settingsHelper = $container->get('settings.settings_helper');
+        assert($settingsHelper instanceof Settings);
+        $surchargeService = $container->get(Surcharge::class);
+        assert($surchargeService instanceof Surcharge);
+        $paymentFieldsService = $container->get(PaymentFieldsService::class);
+        assert($paymentFieldsService instanceof PaymentFieldsService);
+        foreach ($listAllAvailablePaymentMethods as $paymentMethodAvailable) {
+            $paymentMethodId = $paymentMethodAvailable['id'];
+            $paymentMethods[$paymentMethodId] = $this->buildPaymentMethod(
+                $paymentMethodId,
+                $iconFactory,
+                $settingsHelper,
+                $paymentFieldsService,
+                $surchargeService,
+                $paymentMethodAvailable
+            );
+        }
+
+        //I need DirectDebit to create SEPA gateway
+        if (!in_array(Constants::DIRECTDEBIT, array_keys($paymentMethods), true)) {
+            $paymentMethodId = Constants::DIRECTDEBIT;
+            $paymentMethods[$paymentMethodId] = $this->buildPaymentMethod(
+                $paymentMethodId,
+                $iconFactory,
+                $settingsHelper,
+                $paymentFieldsService,
+                $surchargeService,
+                []
+            );
+        }
+        return $paymentMethods;
+    }
+    /**
+     * @param string $id
+     * @param IconFactory $iconFactory
+     * @param Settings $settingsHelper
+     * @param PaymentFieldsService $paymentFieldsService
+     * @param Surcharge $surchargeService
+     * @param array $paymentMethods
+     * @return PaymentMethodI | array
+     */
+    public function buildPaymentMethod(
+        string $id,
+        IconFactory $iconFactory,
+        Settings $settingsHelper,
+        PaymentFieldsService $paymentFieldsService,
+        Surcharge $surchargeService,
+        array $apiMethod
+    ) {
+
+        $transformedId = ucfirst($id);
+        $paymentMethodClassName = 'Mollie\\WooCommerce\\PaymentMethods\\' . $transformedId;
+        $paymentMethod = new $paymentMethodClassName(
+            $iconFactory,
+            $settingsHelper,
+            $paymentFieldsService,
+            $surchargeService,
+            $apiMethod
+        );
+
+        return $paymentMethod;
+    }
 
     public function BillieFieldsMandatory($fields, $errors)
     {

src/Gateway/MolliePaymentGateway.php → src/Gateway/MolliePaymentGatewayHandler.php

@@ -25,7 +25,7 @@
 use WC_Payment_Gateway;
 use WP_Error;
 
-class MolliePaymentGateway extends WC_Payment_Gateway implements MolliePaymentGatewayI
+class MolliePaymentGatewayHandler extends WC_Payment_Gateway implements MolliePaymentGatewayI
 {
     /**
      * @var bool

src/Gateway/OldGatewayBuilder.php

@@ -13,7 +13,7 @@
 use Mollie\WooCommerce\SDK\HttpResponse;
 use Mollie\WooCommerce\Settings\Settings;
 use Mollie\WooCommerce\Shared\Data;
-use Mollie\WooCommerce\Subscription\MollieSepaRecurringGatewayHandlerHandler;
+use Mollie\WooCommerce\Subscription\MollieSepaRecurringGatewayHandler;
 use Mollie\WooCommerce\Subscription\MollieSubscriptionGatewayHandler;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface as Logger;
@@ -59,7 +59,7 @@ public function instantiatePaymentMethodGateways(ContainerInterface $container):
             $key = 'mollie_wc_gateway_' . $paymentMethodId;
             if ($isSepa) {
                 $directDebit = $paymentMethods[Constants::DIRECTDEBIT];
-                $gateways[$key] = new MollieSepaRecurringGatewayHandlerHandler(
+                $gateways[$key] = new MollieSepaRecurringGatewayHandler(
                     $directDebit,
                     $paymentMethod,
                     $paymentService,
@@ -92,7 +92,7 @@ public function instantiatePaymentMethodGateways(ContainerInterface $container):
                     $apiHelper
                 );
             } else {
-                $gateways[$key] = new MolliePaymentGateway(
+                $gateways[$key] = new MolliePaymentGatewayHandler(
                     $paymentMethod,
                     $paymentService,
                     $orderInstructionsService,

src/Gateway/Voucher/MaybeDisableGateway.php

@@ -5,7 +5,7 @@
 namespace Mollie\WooCommerce\Gateway\Voucher;
 
 use Inpsyde\PaymentGateway\PaymentGateway;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\Payment\PaymentService;
 use Mollie\WooCommerce\PaymentMethods\Voucher;
 

src/Gateway/inc/services.php

@@ -37,7 +37,6 @@
             return SharedDataDictionary::GATEWAY_CLASSNAMES;
         },
         'gateway.instances' => static function (ContainerInterface $container): array {
-            //TODO remove this
             $oldGatewayBuilder = new OldGatewayBuilder();
             return $oldGatewayBuilder->instantiatePaymentMethodGateways($container);
         },

src/Payment/MollieObject.php

@@ -8,7 +8,7 @@
 use Mollie\Api\Exceptions\ApiException;
 use Mollie\Api\Resources\Order;
 use Mollie\Api\Resources\Payment;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\PaymentMethods\Voucher;
 use Mollie\WooCommerce\SDK\Api;
 use Mollie\WooCommerce\Settings\Settings;

src/Payment/MollieOrder.php

@@ -10,7 +10,7 @@
 use Mollie\Api\Resources\Payment;
 use Mollie\Api\Resources\Order;
 use Mollie\Api\Resources\Refund;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\PaymentMethods\Voucher;
 use Mollie\WooCommerce\SDK\Api;
 use Mollie\WooCommerce\Shared\SharedDataDictionary;

src/Payment/MollieOrderService.php

@@ -9,7 +9,7 @@
 use Mollie\Api\Resources\Order;
 use Mollie\Api\Resources\Payment;
 use Mollie\WooCommerce\Gateway\AbstractGateway;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\SDK\HttpResponse;
 use Mollie\WooCommerce\Shared\Data;
 use Mollie\WooCommerce\Shared\SharedDataDictionary;

src/Payment/MolliePayment.php

@@ -9,7 +9,7 @@
 use Mollie\Api\Resources\Order;
 use Mollie\Api\Resources\Payment;
 use Mollie\Api\Resources\Refund;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\Gateway\MolliePaymentGatewayI;
 use Mollie\WooCommerce\PaymentMethods\Voucher;
 use Mollie\WooCommerce\SDK\Api;

src/Payment/MollieSubscription.php

@@ -4,7 +4,7 @@
 
 use Inpsyde\PaymentGateway\PaymentGateway;
 use Mollie\Api\Types\SequenceType;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\SDK\Api;
 use Mollie\WooCommerce\Subscription\MollieSubscriptionGatewayHandler;
 

src/Payment/PaymentModule.php

@@ -12,7 +12,7 @@
 use Inpsyde\PaymentGateway\PaymentGateway;
 use Mollie\Api\Exceptions\ApiException;
 use Mollie\Api\Resources\Refund;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\Gateway\MolliePaymentGatewayI;
 use Mollie\WooCommerce\SDK\Api;
 use Mollie\WooCommerce\SDK\HttpResponse;
@@ -326,7 +326,7 @@ public function onOrderDetails(WC_Order $order, ContainerInterface $container)
              * Do not show instruction again below details on order received page
              * Instructions already displayed on top of order received page by $gateway->thankyou_page()
              *
-             * @see MolliePaymentGateway::thankyou_page
+             * @see MolliePaymentGatewayHandler::thankyou_page
              */
             return;
         }

src/PaymentMethods/AbstractPaymentMethod.php

@@ -4,7 +4,7 @@
 
 namespace Mollie\WooCommerce\PaymentMethods;
 
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\Gateway\Surcharge;
 use Mollie\WooCommerce\Payment\PaymentFieldsService;
 use Mollie\WooCommerce\Settings\Settings;

src/PaymentMethods/PaymentFieldsStrategies/PaymentFieldsRenderer.php

@@ -3,13 +3,13 @@
 namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
 
 use Inpsyde\PaymentGateway\PaymentFieldsRendererInterface;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\PaymentMethods\PaymentMethodI;
 
 class PaymentFieldsRenderer implements PaymentFieldsRendererInterface
 {
     private PaymentMethodI $paymentMethod;
-    private MolliePaymentGateway $gateway;
+    private MolliePaymentGatewayHandler $gateway;
 
     public function __construct($paymentMethod, $gateway)
     {

src/Settings/General/MollieGeneralSettings.php

@@ -2,7 +2,7 @@
 
 namespace Mollie\WooCommerce\Settings\General;
 
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\Gateway\Surcharge;
 use Mollie\WooCommerce\Shared\SharedDataDictionary;
 

src/Subscription/MollieSepaRecurringGatewayHandlerHandler.php → src/Subscription/MollieSepaRecurringGatewayHandler.php

@@ -8,7 +8,7 @@
 use DateTime;
 use Mollie\Api\Exceptions\ApiException;
 use Mollie\Api\Types\SequenceType;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\Notice\NoticeInterface;
 use Mollie\WooCommerce\Payment\MollieObject;
 use Mollie\WooCommerce\Payment\MollieOrderService;
@@ -24,7 +24,7 @@
 use Psr\Log\LoggerInterface as Logger;
 use Psr\Log\LogLevel;
 
-class MollieSepaRecurringGatewayHandlerHandler extends MollieSubscriptionGatewayHandler
+class MollieSepaRecurringGatewayHandler extends MollieSubscriptionGatewayHandler
 {
     const WAITING_CONFIRMATION_PERIOD_DAYS = '21';
 
@@ -66,7 +66,7 @@ public function __construct(
             $pluginId,
             $apiHelper
         );
-        $directDebit = new MolliePaymentGateway(
+        $directDebit = new MolliePaymentGatewayHandler(
             $directDebitPaymentMethod,
             $paymentService,
             $orderInstructionsService,

src/Subscription/MollieSubscriptionGatewayHandler.php

@@ -7,7 +7,7 @@
 use Exception;
 use Inpsyde\PaymentGateway\PaymentGateway;
 use Mollie\Api\Exceptions\ApiException;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\Payment\MollieObject;
 use Mollie\WooCommerce\Payment\MollieSubscription;
 use Mollie\WooCommerce\Payment\OrderInstructionsService;
@@ -27,7 +27,7 @@
 use Mollie\WooCommerce\PaymentMethods\Constants;
 use WC_Order;
 
-class MollieSubscriptionGatewayHandler extends MolliePaymentGateway
+class MollieSubscriptionGatewayHandler extends MolliePaymentGatewayHandler
 {
     protected const PAYMENT_TEST_MODE = 'test';
     protected const METHODS_NEEDING_UPDATE = ['mollie_wc_gateway_bancontact',

src/Subscription/SubscriptionModule.php

@@ -9,7 +9,7 @@
 use DateTime;
 use Inpsyde\Modularity\Module\ExecutableModule;
 use Inpsyde\Modularity\Module\ModuleClassNameIdTrait;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\Settings\Settings;
 use Mollie\WooCommerce\Shared\Data;
 use Mollie\WooCommerce\Shared\SharedDataDictionary;

tests/php/Functional/Gateway/MollieGatewayTest.php

@@ -8,7 +8,7 @@
 use Mollie\Api\Resources\Mandate;
 use Mollie\Api\Resources\MandateCollection;
 use Mollie\Api\Resources\Payment;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\Payment\MollieObject;
 use Mollie\WooCommerce\SDK\HttpResponse;
 use Mollie\WooCommerce\Subscription\MollieSubscriptionGatewayHandler;

tests/php/Functional/HelperMocks.php

@@ -5,7 +5,7 @@
 
 
 use Mollie\Api\MollieApiClient;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\Notice\AdminNotice;
 use Mollie\WooCommerce\Payment\MollieOrder;
 use Mollie\WooCommerce\Payment\MollieOrderService;
@@ -257,7 +257,7 @@ public function mollieGatewayBuilder($paymentMethodName, $isSepa, $isSubscriptio
         $pluginId = $this->pluginId();
 
         return $this->buildTesteeMock(
-            MolliePaymentGateway::class,
+            MolliePaymentGatewayHandler::class,
             [
                 $paymentMethod,
                 $paymentService,

tests/php/Functional/Payment/PaymentServiceTest.php

@@ -5,7 +5,7 @@
 use Mollie\Api\Endpoints\OrderEndpoint;
 use Mollie\Api\Exceptions\ApiException;
 use Mollie\Api\MollieApiClient;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\Payment\PaymentCheckoutRedirectService;
 use Mollie\WooCommerce\Payment\PaymentService;
 use Mollie\WooCommerce\PaymentMethods\IconFactory;

tests/php/Functional/SDK/SdkTest.php

@@ -9,7 +9,7 @@
 use Mollie\Api\Resources\Mandate;
 use Mollie\Api\Resources\MandateCollection;
 use Mollie\Api\Resources\Payment;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
 use Mollie\WooCommerce\Payment\MollieObject;
 use Mollie\WooCommerce\SDK\HttpResponse;
 use Mollie\WooCommerce\SDK\WordPressHttpAdapter;