Merge branch 'MC-17576' of https://github.com/magento-mpi/magento2ce into pr_2019_07_11

Author: vkolesny

app/code/Magento/Signifyd/etc/di.xml

@@ -68,6 +68,9 @@
             <argument name="converter" xsi:type="object">Magento\Signifyd\Model\PaymentMethodMapper\XmlToArrayConfigConverter</argument>
             <argument name="schemaLocator" xsi:type="object">PaymentMapperSchemaLocator</argument>
             <argument name="fileName" xsi:type="string">signifyd_payment_mapping.xml</argument>
+            <argument name="idAttributes" xsi:type="array">
+                <item name="/config/payment_method_list/payment_method" xsi:type="string">name</item>
+            </argument>
         </arguments>
     </virtualType>
     <virtualType name="PaymentMethodConfigData" type="Magento\Framework\Config\Data">

app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xml

@@ -6,7 +6,7 @@
  */
  /**
   * Custom payment method might adds a block in payment_method_list e.g.
-  *      <payment_method>
+  *      <payment_method name="custom_payment_method">
   *         <magento_code>custom_payment_method</magento_code>
   *         <signifyd_code>PAYMENT_CARD</signifyd_code>
   *     </payment_method>
@@ -18,63 +18,63 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Signifyd:etc/signifyd_payment_mapping.xsd">
     <payment_method_list>
-        <payment_method>
+        <payment_method name="braintree">
             <magento_code>braintree</magento_code>
             <signifyd_code>PAYMENT_CARD</signifyd_code>
         </payment_method>
-        <payment_method>
+        <payment_method name="braintree_paypal">
             <magento_code>braintree_paypal</magento_code>
             <signifyd_code>PAYPAL_ACCOUNT</signifyd_code>
         </payment_method>
-        <payment_method>
+        <payment_method name="paypal_express">
             <magento_code>paypal_express</magento_code>
             <signifyd_code>PAYPAL_ACCOUNT</signifyd_code>
         </payment_method>
-        <payment_method>
+        <payment_method name="paypal_express_bml">
             <magento_code>paypal_express_bml</magento_code>
             <signifyd_code>PAYPAL_ACCOUNT</signifyd_code>
         </payment_method>
-        <payment_method>
+        <payment_method name="payflow_express">
             <magento_code>payflow_express</magento_code>
             <signifyd_code>PAYPAL_ACCOUNT</signifyd_code>
         </payment_method>
-        <payment_method>
+        <payment_method name="payflow_express_bml">
             <magento_code>payflow_express_bml</magento_code>
             <signifyd_code>PAYPAL_ACCOUNT</signifyd_code>
         </payment_method>
-        <payment_method>
+        <payment_method name="payflowpro">
             <magento_code>payflowpro</magento_code>
             <signifyd_code>PAYMENT_CARD</signifyd_code>
         </payment_method>
-        <payment_method>
+        <payment_method name="payflow_link">
             <magento_code>payflow_link</magento_code>
             <signifyd_code>PAYMENT_CARD</signifyd_code>
         </payment_method>
-        <payment_method>
+        <payment_method name="payflow_advanced">
             <magento_code>payflow_advanced</magento_code>
             <signifyd_code>PAYMENT_CARD</signifyd_code>
         </payment_method>
-        <payment_method>
+        <payment_method name="hosted_pro">
             <magento_code>hosted_pro</magento_code>
             <signifyd_code>PAYMENT_CARD</signifyd_code>
         </payment_method>
-        <payment_method>
+        <payment_method name="authorizenet_directpost">
             <magento_code>authorizenet_directpost</magento_code>
             <signifyd_code>PAYMENT_CARD</signifyd_code>
         </payment_method>
-        <payment_method>
+        <payment_method name="worldpay">
             <magento_code>worldpay</magento_code>
             <signifyd_code>PAYMENT_CARD</signifyd_code>
         </payment_method>
-        <payment_method>
+        <payment_method name="eway">
             <magento_code>eway</magento_code>
             <signifyd_code>PAYMENT_CARD</signifyd_code>
         </payment_method>
-        <payment_method>
+        <payment_method name="cybersource">
             <magento_code>cybersource</magento_code>
             <signifyd_code>PAYMENT_CARD</signifyd_code>
         </payment_method>
-        <payment_method>
+        <payment_method name="free">
             <magento_code>free</magento_code>
             <signifyd_code>FREE</signifyd_code>
         </payment_method>

app/code/Magento/Signifyd/etc/signifyd_payment_mapping.xsd

@@ -23,5 +23,12 @@
             <xs:element minOccurs="1" name="magento_code"/>
             <xs:element minOccurs="1" name="signifyd_code"/>
         </xs:sequence>
+        <xs:attribute name="name" type="xs:string" use="optional">
+            <xs:annotation>
+                <xs:documentation>
+                    Element's unique identifier.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
     </xs:complexType>
 </xs:schema>