Fix cs, composer update

mollie · Jan 7, 2025 · ea81951 · ea81951
1 parent b27ce4a
commit ea81951
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 46 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Gateway/GatewayModule.php b/src/Gateway/GatewayModule.php
@@ -93,7 +93,6 @@ static function ($gateways) use ($container) {
             30
         );
 
-
         // Disable SEPA as payment option in WooCommerce checkout
         add_filter(
             'woocommerce_available_payment_gateways',
@@ -188,7 +187,6 @@ static function ($paymentContext) {
             return $fields;
         }, 10, 3);
 
-
         return true;
     }
 

diff --git a/src/Gateway/MolliePaymentGatewayHandler.php b/src/Gateway/MolliePaymentGatewayHandler.php
@@ -36,7 +36,7 @@ class MolliePaymentGatewayHandler
     /**
      * @var PaymentMethodI
      */
-    public $paymentMethod;
+    protected PaymentMethodI $paymentMethod;
     /**
      * @var string
      */

diff --git a/src/Gateway/inc/services.php b/src/Gateway/inc/services.php
@@ -285,7 +285,7 @@
                 $deprecatedGatewayHelper = $oldGatewayInstances[$gatewayId];
                 add_action(
                     'woocommerce_thankyou_' . $paymentGateway->id,
-                    function ($order_id) use ($instructionsManager, $paymentGateway, $deprecatedGatewayHelper) {
+                    static function ($order_id) use ($instructionsManager, $paymentGateway, $deprecatedGatewayHelper) {
                         $order = wc_get_order($order_id);
 
                         // Order not found
@@ -318,7 +318,7 @@ function ($order_id) use ($instructionsManager, $paymentGateway, $deprecatedGate
                 $deprecatedGatewayHelper = $oldGatewayInstances[$gatewayId];
                 add_action(
                     'woocommerce_email_after_order_table',
-                    function ($order, $sent_to_admin, $plain_text) use ($instructionsManager, $paymentGateway, $deprecatedGatewayHelper) {
+                    static function ($order, $sent_to_admin, $plain_text) use ($instructionsManager, $paymentGateway, $deprecatedGatewayHelper) {
                         $instructionsManager->displayInstructions(
                             $paymentGateway,
                             $deprecatedGatewayHelper,
@@ -333,7 +333,7 @@ function ($order, $sent_to_admin, $plain_text) use ($instructionsManager, $payme
 
                 add_action(
                     'woocommerce_email_order_meta',
-                    function ($order, $sent_to_admin, $plain_text) use ($instructionsManager, $paymentGateway, $deprecatedGatewayHelper) {
+                    static function ($order, $sent_to_admin, $plain_text) use ($instructionsManager, $paymentGateway, $deprecatedGatewayHelper) {
                         $instructionsManager->displayInstructions(
                             $paymentGateway,
                             $deprecatedGatewayHelper,
@@ -354,7 +354,7 @@ function ($order, $sent_to_admin, $plain_text) use ($instructionsManager, $payme
                 if ($paymentGateway->supports('subscriptions')) {
                     add_filter(
                         $pluginId . '_is_subscription_payment',
-                        function ($isSubscription, $orderId) use ($pluginId, $dataHelper) {
+                        static function ($isSubscription, $orderId) use ($pluginId, $dataHelper) {
                             if ($dataHelper->isWcSubscription($orderId)) {
                                 add_filter(
                                     $pluginId . '_is_automatic_payment_disabled',

diff --git a/src/Payment/MollieSubscription.php b/src/Payment/MollieSubscription.php
@@ -93,7 +93,7 @@ protected function getRecurringPaymentDescription($order, $option, $initialPayme
         $middleware = new PaymentDescriptionMiddleware($this->dataHelper);
         $requestData = [];
         $context = 'payment';
-        $result = $middleware->__invoke($requestData, $order, $context, function($requestData) {
+        $result = $middleware->__invoke($requestData, $order, $context, static function ($requestData) {
             return $requestData;
         });
         return $result['description'];

diff --git a/src/Payment/PaymentProcessor.php b/src/Payment/PaymentProcessor.php
@@ -87,8 +87,9 @@ public function __construct(
 
     public function setGatewayHelper(string $paymentGatewayId)
     {
-        $this->deprecatedGatewayHelper = $this->deprecatedGatewayInstances[$paymentGatewayId]??false;
+        $this->deprecatedGatewayHelper = $this->deprecatedGatewayInstances[$paymentGatewayId] ?? false;
     }
+
     public function setGateway(PaymentGateway $gateway)
     {
         $this->gateway = $gateway;
@@ -99,7 +100,7 @@ public function processPayment($order, $paymentGateway): array
         $orderId = $order->get_id();
         $this->setGateway($paymentGateway);
         $this->setGatewayHelper($paymentGateway->id);
-        if($this->deprecatedGatewayHelper === false){
+        if ($this->deprecatedGatewayHelper === false) {
             return ['result' => 'failure'];
         }
 

diff --git a/src/Payment/Request/Middleware/AddCustomRequestFieldsMiddleware.php b/src/Payment/Request/Middleware/AddCustomRequestFieldsMiddleware.php
@@ -52,7 +52,7 @@ public function __invoke(array $requestData, WC_Order $order, $context, $next):
                 if (class_exists($middlewareClass)) {
                     $middleware = $this->container->get($middlewareClass);
                     if ($middleware instanceof RequestMiddlewareInterface) {
-                        $requestData = $middleware->__invoke($requestData, $order);
+                        $requestData = $middleware->__invoke($requestData, $order, $context, $next);
                     }
                 }
             }

diff --git a/src/Payment/Request/Middleware/MiddlewareHandler.php b/src/Payment/Request/Middleware/MiddlewareHandler.php
@@ -54,12 +54,12 @@ private function createMiddlewareChain(array $middlewares): callable
     {
         return array_reduce(
             array_reverse($middlewares),
-            function ($next, $middleware) {
-                return function ($requestData, $order, $context) use ($middleware, $next) {
+            static function ($next, $middleware) {
+                return static function ($requestData, $order, $context) use ($middleware, $next) {
                     return $middleware($requestData, $order, $context, $next);
                 };
             },
-            function ($requestData) {
+            static function ($requestData) {
                 return $requestData;
             }
         );

diff --git a/src/Payment/Request/Middleware/RequestMiddlewareInterface.php b/src/Payment/Request/Middleware/RequestMiddlewareInterface.php
@@ -9,11 +9,11 @@ interface RequestMiddlewareInterface
     /**
      * Invoke the middleware.
      *
-     * @param array<string, mixed> $requestData The request data to be modified.
+     * @param array $requestData The request data to be modified.
      * @param WC_Order $order The WooCommerce order object.
      * @param string $context Additional context for the middleware.
      * @param callable $next The next middleware to be called.
-     * @return array<string, mixed> The modified request data.
+     * @return array The modified request data.
      */
     public function __invoke(array $requestData, WC_Order $order, string $context, callable $next): array;
 }
diff --git a/src/PaymentMethods/InstructionStrategies/OrderInstructionsManager.php b/src/PaymentMethods/InstructionStrategies/OrderInstructionsManager.php
@@ -48,25 +48,26 @@ public function displayInstructions(
         $admin_instructions = false,
         $plain_text = false
     ) {
+
         if (
             ($admin_instructions && !self::$alreadyDisplayedAdminInstructions)
             || (!$admin_instructions && !self::$alreadyDisplayedCustomerInstructions)
         ) {
             $order_payment_method = $order->get_payment_method();
 
             // Invalid gateway
-            if ($deprecatedGatewayHelper->id !== $order_payment_method) {
+            if ($paymentGateway->id !== $order_payment_method) {
                 return;
             }
 
             $payment = $deprecatedGatewayHelper->paymentObject()->getActiveMolliePayment(
                 $order->get_id()
             );
-
+            $methodId = str_replace('mollie_wc_gateway_', '', $paymentGateway->id);
             // Mollie payment not found or invalid gateway
             if (
                 !$payment
-                || $payment->method !== $deprecatedGatewayHelper->paymentMethod->getProperty('id')
+                || $payment->method !== $methodId
             ) {
                 return;
             }

diff --git a/src/PaymentMethods/PaymentFieldsStrategies/BillieFieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/BillieFieldsStrategy.php
@@ -10,7 +10,9 @@ class BillieFieldsStrategy extends AbstractPaymentFieldsRenderer implements Paym
 {
     const FIELD_COMPANY = "billing_company";
 
-    public function renderFields(): string    {
+    public function renderFields(): string
+    {
+
         $showCompanyField = false;
 
         if (is_checkout_pay_page()) {

diff --git a/src/PaymentMethods/PaymentFieldsStrategies/CreditcardFieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/CreditcardFieldsStrategy.php
@@ -14,7 +14,6 @@ public function renderFields(): string
         if (!$this->isMollieComponentsEnabled($this->deprecatedHelperGateway->paymentMethod())) {
             return '';
         }
-        $this->deprecatedHelperGateway->has_fields = true;
         $allowedHtml = $this->svgAllowedHtml();
 
         $output = '<div class="mollie-components"></div>';