Merge pull request #371 from mollie/1.24.0

1.24.0
mollie · Mar 22, 2021 · a807f1d · a807f1d
2 parents 7691c14 + 32cd274
commit a807f1d
Show file tree

Hide file tree

Showing 19 changed files with 246 additions and 43 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -11,16 +11,12 @@ jobs:
             MAGENTO_VERSION: 2.2.11
           - PHP_VERSION: php71-fpm
             MAGENTO_VERSION: 2.2.11
-          - PHP_VERSION: php71-fpm
-            MAGENTO_VERSION: 2.3.4
-          - PHP_VERSION: php72-fpm
-            MAGENTO_VERSION: 2.3.4
           - PHP_VERSION: php73-fpm
-            MAGENTO_VERSION: 2.3.4
+            MAGENTO_VERSION: 2.3.6-p1
           - PHP_VERSION: php73-fpm
-            MAGENTO_VERSION: 2.4.0
+            MAGENTO_VERSION: 2.4.2
           - PHP_VERSION: php74-fpm
-            MAGENTO_VERSION: 2.4.0
+            MAGENTO_VERSION: 2.4.2
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -0,0 +1,38 @@
+name: Lint PHP files
+on: push
+
+jobs:
+  php-70:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: StephaneBour/actions-php-lint@7.0
+        with:
+          dir: './'
+
+  php-71:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: StephaneBour/actions-php-lint@7.1
+        with:
+          dir: './'
+
+  php-72:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: StephaneBour/actions-php-lint@7.2
+        with:
+          dir: './'
+
+  php-73:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: StephaneBour/actions-php-lint@7.3
+        with:
+          dir: './'
+
+  php-74:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: StephaneBour/actions-php-lint@7.4
+        with:
+          dir: './'
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -6,8 +6,13 @@ jobs:
     build:
         strategy:
             matrix:
-                PHP_VERSION: [php71-fpm, php72-fpm]
-                MAGENTO_VERSION: [2.3.5-p1]
+              include:
+                - PHP_VERSION: php71-fpm
+                  MAGENTO_VERSION: 2.3.5-p1
+                - PHP_VERSION: php72-fpm
+                  MAGENTO_VERSION: 2.3.5-p1
+                - PHP_VERSION: php74-fpm
+                  MAGENTO_VERSION: 2.4.2
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v1

diff --git a/.github/workflows/setup-di-compile.yml b/.github/workflows/setup-di-compile.yml
@@ -6,13 +6,13 @@ jobs:
     build:
         strategy:
             matrix:
-                PHP_VERSION: [php7-fpm, php71-fpm, php72-fpm]
-                MAGENTO_VERSION: [2.2.11, 2.3.5-p1]
-                exclude:
-                    - PHP_VERSION: php7-fpm
-                      MAGENTO_VERSION: 2.3.5-p1
-                    - PHP_VERSION: php72-fpm
-                      MAGENTO_VERSION: 2.2.11
+              include:
+                - PHP_VERSION: php7-fpm
+                  MAGENTO_VERSION: 2.2.11
+                - PHP_VERSION: php72-fpm
+                  MAGENTO_VERSION: 2.3.6-p1
+                - PHP_VERSION: php74-fpm
+                  MAGENTO_VERSION: 2.4.2
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v1

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -11,15 +11,15 @@ jobs:
           - PHP_VERSION: php71-fpm
             MAGENTO_VERSION: 2.2.11
           - PHP_VERSION: php71-fpm
-            MAGENTO_VERSION: 2.3.4
+            MAGENTO_VERSION: 2.3.6-p1
           - PHP_VERSION: php72-fpm
-            MAGENTO_VERSION: 2.3.4
+            MAGENTO_VERSION: 2.3.6-p1
           - PHP_VERSION: php73-fpm
-            MAGENTO_VERSION: 2.3.4
+            MAGENTO_VERSION: 2.3.6-p1
           - PHP_VERSION: php73-fpm
-            MAGENTO_VERSION: 2.4.0
+            MAGENTO_VERSION: 2.4.2
           - PHP_VERSION: php74-fpm
-            MAGENTO_VERSION: 2.4.0
+            MAGENTO_VERSION: 2.4.2
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1

diff --git a/Model/Methods/Voucher.php b/Model/Methods/Voucher.php
@@ -104,7 +104,8 @@ public function __construct(
 
     public function isAvailable(CartInterface $quote = null)
     {
-        $voucherCategory = $this->config->getVoucherCategory($quote->getStoreId());
+        $storeId = $quote ? $quote->getStoreId() : null;
+        $voucherCategory = $this->config->getVoucherCategory($storeId);
         if ($quote && !$voucherCategory) {
             return false;
         }
@@ -116,4 +117,4 @@ public function isAvailable(CartInterface $quote = null)
 
         return parent::isAvailable($quote);
     }
-}
+}
diff --git a/Model/MollieConfigProvider.php b/Model/MollieConfigProvider.php
@@ -20,6 +20,7 @@
 use Mollie\Payment\Helper\General as MollieHelper;
 use Mollie\Payment\Model\Mollie as MollieModel;
 use Mollie\Payment\Service\Mollie\GetIssuers;
+use Mollie\Payment\Service\Mollie\MethodParameters;
 
 /**
  * Class MollieConfigProvider
@@ -101,19 +102,25 @@ class MollieConfigProvider implements ConfigProviderInterface
      */
     private $storeManager;
 
+    /**
+     * @var MethodParameters
+     */
+    private $methodParameters;
+
     /**
      * MollieConfigProvider constructor.
      *
-     * @param Mollie                $mollieModel
-     * @param MollieHelper          $mollieHelper
-     * @param PaymentHelper         $paymentHelper
-     * @param CheckoutSession       $checkoutSession
-     * @param AssetRepository       $assetRepository
-     * @param Escaper               $escaper
-     * @param Resolver              $localeResolver
-     * @param Config                $config
-     * @param GetIssuers            $getIssuers
+     * @param Mollie $mollieModel
+     * @param MollieHelper $mollieHelper
+     * @param PaymentHelper $paymentHelper
+     * @param CheckoutSession $checkoutSession
+     * @param AssetRepository $assetRepository
+     * @param Escaper $escaper
+     * @param Resolver $localeResolver
+     * @param Config $config
+     * @param GetIssuers $getIssuers
      * @param StoreManagerInterface $storeManager
+     * @param MethodParameters $methodParameters
      */
     public function __construct(
         MollieModel $mollieModel,
@@ -125,7 +132,8 @@ public function __construct(
         Resolver $localeResolver,
         Config $config,
         GetIssuers $getIssuers,
-        StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager,
+        MethodParameters $methodParameters
     ) {
         $this->mollieModel = $mollieModel;
         $this->mollieHelper = $mollieHelper;
@@ -137,6 +145,8 @@ public function __construct(
         $this->localeResolver = $localeResolver;
         $this->getIssuers = $getIssuers;
         $this->storeManager = $storeManager;
+        $this->methodParameters = $methodParameters;
+
         foreach ($this->methodCodes as $code) {
             $this->methods[$code] = $this->getMethodInstance($code);
         }
@@ -230,13 +240,13 @@ public function getActiveMethods($mollieApi, CartInterface $cart = null)
 
         try {
             $amount = $this->mollieHelper->getOrderAmountByQuote($cart);
-            $params = [
+            $parameters = [
                 'amount[value]' => $amount['value'],
                 'amount[currency]' => $amount['currency'],
                 'resource' => 'orders',
                 'includeWallets' => 'applepay',
             ];
-            $apiMethods = $mollieApi->methods->all($params);
+            $apiMethods = $mollieApi->methods->allActive($this->methodParameters->enhance($parameters, $cart));
 
             foreach ($apiMethods as $method) {
                 $methodId = 'mollie_methods_' . $method->id;

diff --git a/Service/Mollie/MethodParameters.php b/Service/Mollie/MethodParameters.php
@@ -0,0 +1,35 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Mollie\Payment\Service\Mollie;
+
+use Magento\Quote\Api\Data\CartInterface;
+use Mollie\Payment\Service\Mollie\Parameters\ParameterPartInterface;
+
+class MethodParameters
+{
+    /**
+     * @var ParameterPartInterface[]
+     */
+    private $parametersParts;
+
+    /**
+     * @param ParameterPartInterface[] $parametersParts
+     */
+    public function __construct(array $parametersParts)
+    {
+        $this->parametersParts = $parametersParts;
+    }
+
+    public function enhance(array $parameters, CartInterface $cart): array
+    {
+        foreach ($this->parametersParts as $parametersPart) {
+            $parameters = $parametersPart->enhance($parameters, $cart);
+        }
+
+        return $parameters;
+    }
+}
diff --git a/Service/Mollie/Parameters/ParameterPartInterface.php b/Service/Mollie/Parameters/ParameterPartInterface.php
@@ -0,0 +1,19 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Mollie\Payment\Service\Mollie\Parameters;
+
+use Magento\Quote\Api\Data\CartInterface;
+
+interface ParameterPartInterface
+{
+    /**
+     * @param array $parameters
+     * @param CartInterface|null $cart
+     * @return array
+     */
+    public function enhance(array $parameters, CartInterface $cart): array;
+}
diff --git a/Service/Order/PaymentReminder.php b/Service/Order/PaymentReminder.php
@@ -91,7 +91,7 @@ public function send(PendingPaymentReminderInterface $pendingPaymentReminder): O
         return $order;
     }
 
-    private function moveReminderFromPendingToSent(OrderInterface $order, PendingPaymentReminderInterface $pendingPaymentReminder): void
+    private function moveReminderFromPendingToSent(OrderInterface $order, PendingPaymentReminderInterface $pendingPaymentReminder)
     {
         if ($this->isAlreadySend($order)) {
             // Already sent, so delete the pending payment reminder.
@@ -119,4 +119,4 @@ private function isAlreadySend(OrderInterface $order): bool
             return false;
         }
     }
-}
+}
diff --git a/Test/Integration/Model/Methods/AbstractMethodTest.php b/Test/Integration/Model/Methods/AbstractMethodTest.php
@@ -88,7 +88,7 @@ public function testThatTheMethodIsActive()
 
         $mollieApiClient = $this->createMock(MollieApiClient::class);
         $mollieApiClient->methods = $this->createMock(MethodEndpoint::class);
-        $mollieApiClient->methods->method('all')->willReturn($methodCollection);
+        $mollieApiClient->methods->method('allActive')->willReturn($methodCollection);
 
         /** @var MollieConfigProvider $instance */
         $instance = $this->objectManager->create(MollieConfigProvider::class, [

diff --git a/Test/Integration/Model/Methods/ApplePayTest.php b/Test/Integration/Model/Methods/ApplePayTest.php
@@ -25,7 +25,7 @@ public function testTheIncludeWalletsParameterIsUsed()
         $mollieApiClient = $this->createMock(MollieApiClient::class);
         $mollieApiClient->methods = $this->createMock(MethodEndpoint::class);
 
-        $mollieApiClient->methods->expects($this->once())->method('all')->with($this->callback(function ($arguments) {
+        $mollieApiClient->methods->expects($this->once())->method('allActive')->with($this->callback(function ($arguments) {
             $this->assertArrayHasKey('includeWallets', $arguments);
             $this->assertEquals('applepay', $arguments['includeWallets']);
 

diff --git a/Test/Integration/Model/Methods/VoucherTest.php b/Test/Integration/Model/Methods/VoucherTest.php
@@ -48,4 +48,15 @@ public function testIsAvailableWhenTheCategoryIsSet()
         $instance = $this->objectManager->create(Voucher::class);
         $this->assertTrue($instance->isAvailable($cart));
     }
+
+    /**
+     * @magentoConfigFixture default_store payment/mollie_methods_voucher/category
+     */
+    public function testIsAvailableWhenNoCategoryIsAvailable()
+    {
+        /** @var Voucher $instance */
+        $instance = $this->objectManager->create(Voucher::class);
+
+        $this->assertFalse($instance->isAvailable(null));
+    }
 }
diff --git a/Test/Integration/Service/Mollie/MethodParameterPartTest.php b/Test/Integration/Service/Mollie/MethodParameterPartTest.php
@@ -0,0 +1,79 @@
+<?php
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Mollie\Payment\Service\Mollie;
+
+use Magento\Quote\Api\Data\CartInterface;
+use Mollie\Payment\Service\Mollie\Parameters\ParameterPartInterface;
+use Mollie\Payment\Test\Integration\IntegrationTestCase;
+
+class MethodParametersTest extends IntegrationTestCase
+{
+    const DEFAULT_INPUT = [
+        'amount[value]' => 10,
+        'amount[currency]' => 'EUR',
+        'resource' => 'orders',
+        'includeWallets' => 'applepay',
+    ];
+
+    public function testChangesNothingWhenNoPartsAreConfigured()
+    {
+        /** @var MethodParameters $instance */
+        $instance = $this->objectManager->create(MethodParameters::class, ['parametersParts' => []]);
+
+        $result = $instance->enhance(static::DEFAULT_INPUT, $this->objectManager->create(CartInterface::class));
+
+        $this->assertEquals(static::DEFAULT_INPUT, $result);
+    }
+
+    public function testTheParametersCanBeAdjusted()
+    {
+        $part = new class() implements ParameterPartInterface {
+            public function enhance(array $parameters, CartInterface $cart): array
+            {
+                return $parameters + ['test' => true];
+            }
+        };
+
+        /** @var MethodParameters $instance */
+        $instance = $this->objectManager->create(MethodParameters::class, ['parametersParts' => [
+            'testPart' => $part,
+        ]]);
+
+        $result = $instance->enhance(static::DEFAULT_INPUT, $this->objectManager->create(CartInterface::class));
+
+        $this->assertEquals(static::DEFAULT_INPUT + ['test' => true], $result);
+    }
+
+    public function testSupportsMultipleParameterParts()
+    {
+        $part1 = new class() implements ParameterPartInterface {
+            public function enhance(array $parameters, CartInterface $cart): array
+            {
+                return $parameters + ['test1' => true];
+            }
+        };
+
+        $part2 = new class() implements ParameterPartInterface {
+            public function enhance(array $parameters, CartInterface $cart): array
+            {
+                return $parameters + ['test2' => true];
+            }
+        };
+
+        /** @var MethodParameters $instance */
+        $instance = $this->objectManager->create(MethodParameters::class, [
+            'parametersParts' => [
+                'test1' => $part1,
+                'test2' => $part2,
+            ]
+        ]);
+
+        $result = $instance->enhance(static::DEFAULT_INPUT, $this->objectManager->create(CartInterface::class));
+
+        $this->assertEquals(static::DEFAULT_INPUT + ['test1' => true, 'test2' => true], $result);
+    }
+}