ENGCOM-6816: Allows additional payment checks in payment method list #24691

Author: slavvka

app/code/Magento/Payment/Model/MethodList.php

@@ -39,19 +39,29 @@ class MethodList
      */
     private $paymentMethodInstanceFactory;
 
+    /**
+     * @var array
+     */
+    private $additionalChecks;
+
     /**
      * @param \Magento\Payment\Helper\Data $paymentHelper
-     * @param Checks\SpecificationFactory $specificationFactory
+     * @param Checks\SpecificationFactory  $specificationFactory
+     * @param array                        $additionalChecks
      */
     public function __construct(
         \Magento\Payment\Helper\Data $paymentHelper,
-        \Magento\Payment\Model\Checks\SpecificationFactory $specificationFactory
+        \Magento\Payment\Model\Checks\SpecificationFactory $specificationFactory,
+        array $additionalChecks = []
     ) {
         $this->paymentHelper = $paymentHelper;
         $this->methodSpecificationFactory = $specificationFactory;
+        $this->additionalChecks = $additionalChecks;
     }
 
     /**
+     * Returns all available payment methods for the given quote.
+     *
      * @param \Magento\Quote\Api\Data\CartInterface $quote
      * @return \Magento\Payment\Model\MethodInterface[]
      */
@@ -80,12 +90,15 @@ public function getAvailableMethods(\Magento\Quote\Api\Data\CartInterface $quote
     protected function _canUseMethod($method, \Magento\Quote\Api\Data\CartInterface $quote)
     {
         return $this->methodSpecificationFactory->create(
-            [
-                AbstractMethod::CHECK_USE_CHECKOUT,
-                AbstractMethod::CHECK_USE_FOR_COUNTRY,
-                AbstractMethod::CHECK_USE_FOR_CURRENCY,
-                AbstractMethod::CHECK_ORDER_TOTAL_MIN_MAX,
-            ]
+            array_merge(
+                [
+                    AbstractMethod::CHECK_USE_CHECKOUT,
+                    AbstractMethod::CHECK_USE_FOR_COUNTRY,
+                    AbstractMethod::CHECK_USE_FOR_CURRENCY,
+                    AbstractMethod::CHECK_ORDER_TOTAL_MIN_MAX,
+                ],
+                $this->additionalChecks
+            )
         )->isApplicable(
             $method,
             $quote

app/code/Magento/Payment/Test/Unit/Model/MethodListTest.php

@@ -6,8 +6,8 @@
 
 namespace Magento\Payment\Test\Unit\Model;
 
-use Magento\Payment\Model\MethodList;
 use Magento\Payment\Model\Method\AbstractMethod;
+use Magento\Payment\Model\MethodList;
 
 class MethodListTest extends \PHPUnit\Framework\TestCase
 {
@@ -36,6 +36,11 @@ class MethodListTest extends \PHPUnit\Framework\TestCase
      */
     protected $specificationFactoryMock;
 
+    /**
+     * @var array $additionalChecks
+     */
+    private $additionalChecks;
+
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -49,10 +54,14 @@ protected function setUp()
         )->disableOriginalConstructor()->getMock();
 
         $this->specificationFactoryMock = $this->createMock(\Magento\Payment\Model\Checks\SpecificationFactory::class);
+
+        $this->additionalChecks = ['acme_custom_payment_method_check' => 'acme_custom_payment_method_check'];
+
         $this->methodList = $this->objectManager->getObject(
             \Magento\Payment\Model\MethodList::class,
             [
-                'specificationFactory' => $this->specificationFactoryMock
+                'specificationFactory' => $this->specificationFactoryMock,
+                'additionalChecks' => $this->additionalChecks
             ]
         );
 
@@ -68,6 +77,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * Verify available payment methods
+     */
     public function testGetAvailableMethods()
     {
         $storeId = 1;
@@ -90,13 +102,17 @@ public function testGetAvailableMethods()
 
         $this->specificationFactoryMock->expects($this->atLeastOnce())
             ->method('create')
-            ->with([
-                AbstractMethod::CHECK_USE_CHECKOUT,
-                AbstractMethod::CHECK_USE_FOR_COUNTRY,
-                AbstractMethod::CHECK_USE_FOR_CURRENCY,
-                AbstractMethod::CHECK_ORDER_TOTAL_MIN_MAX
-            ])
-            ->will($this->returnValue($compositeMock));
+        ->with(
+            array_merge(
+                [
+                   AbstractMethod::CHECK_USE_CHECKOUT,
+                   AbstractMethod::CHECK_USE_FOR_COUNTRY,
+                   AbstractMethod::CHECK_USE_FOR_CURRENCY,
+                   AbstractMethod::CHECK_ORDER_TOTAL_MIN_MAX
+                ],
+                $this->additionalChecks
+            )
+        )->will($this->returnValue($compositeMock));
 
         $methodMock = $this->getMockForAbstractClass(\Magento\Payment\Api\Data\PaymentMethodInterface::class);
         $this->paymentMethodList->expects($this->once())