ENGCOM-8283: Avoid exception when config.xml nodes exist for not-installed payment methods #27940

Author: sidolov

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

@@ -6,53 +6,57 @@
 namespace Magento\Payment\Model;
 
 use Magento\Payment\Api\Data\PaymentMethodInterface;
+use Magento\Payment\Api\Data\PaymentMethodInterfaceFactory;
+use Magento\Payment\Api\PaymentMethodListInterface;
+use Magento\Payment\Helper\Data;
+use UnexpectedValueException;
 
-/**
- * Payment method list class.
- */
-class PaymentMethodList implements \Magento\Payment\Api\PaymentMethodListInterface
+class PaymentMethodList implements PaymentMethodListInterface
 {
     /**
-     * @var \Magento\Payment\Api\Data\PaymentMethodInterfaceFactory
+     * @var PaymentMethodInterfaceFactory
      */
     private $methodFactory;
 
     /**
-     * @var \Magento\Payment\Helper\Data
+     * @var Data
      */
     private $helper;
 
     /**
-     * @param \Magento\Payment\Api\Data\PaymentMethodInterfaceFactory $methodFactory
-     * @param \Magento\Payment\Helper\Data $helper
+     * @param PaymentMethodInterfaceFactory $methodFactory
+     * @param Data $helper
      */
     public function __construct(
-        \Magento\Payment\Api\Data\PaymentMethodInterfaceFactory $methodFactory,
-        \Magento\Payment\Helper\Data $helper
+        PaymentMethodInterfaceFactory $methodFactory,
+        Data $helper
     ) {
         $this->methodFactory = $methodFactory;
         $this->helper = $helper;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getList($storeId)
     {
         $methodsCodes = array_keys($this->helper->getPaymentMethods());
-
         $methodsInstances = array_map(
             function ($code) {
-                return $this->helper->getMethodInstance($code);
+                try {
+                    return $this->helper->getMethodInstance($code);
+                } catch (UnexpectedValueException $e) {
+                    return null;
+                }
             },
             $methodsCodes
         );
 
-        $methodsInstances = array_filter($methodsInstances, function (MethodInterface $method) {
-            return !($method instanceof \Magento\Payment\Model\Method\Substitution);
+        $methodsInstances = array_filter($methodsInstances, function ($method) {
+            return $method && !($method instanceof \Magento\Payment\Model\Method\Substitution);
         });
 
-        @uasort(
+        uasort(
             $methodsInstances,
             function (MethodInterface $a, MethodInterface $b) use ($storeId) {
                 return (int)$a->getConfigData('sort_order', $storeId) - (int)$b->getConfigData('sort_order', $storeId);
@@ -76,7 +80,7 @@ function (MethodInterface $methodInstance) use ($storeId) {
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getActiveList($storeId)
     {

dev/tests/integration/_files/Magento/TestModuleFakePaymentMethod/etc/config.xml

@@ -32,6 +32,11 @@
                     <supported>1</supported>
                 </instant_purchase>
             </fake_vault>
+            <fake_no_model>
+                <!-- This method on purpose does not have a 'model' node. -->
+                <title>Fake Payment Method without &lt;model&gt;</title>
+                <active>0</active>
+            </fake_no_model>
         </payment>
     </default>
-</config>
+</config>