Merge branch 'develop' into 1.0-forward

Author: shiftedreality

patches.json

@@ -78,9 +78,6 @@
       "2.2.0 - 2.2.3": "SET-36__fix_oom_during_customer_import__2.2.0.patch",
       "2.2.4": "SET-36__fix_oom_during_customer_import__2.2.4.patch"
     },
-    "Add PayPal and Braintree TPV codes on checkout": {
-      "~2.1.8": "MAGETWO-53941__fix_enterprise_payment_codes__2.1.8.patch"
-    },
     "Fix Mview on staging environments": {
       "2.1.4": "MAGETWO-84444__fix_mview_on_staging__2.1.4.patch",
       "2.1.5 - 2.1.9": "MAGETWO-84444__fix_mview_on_staging__2.1.5.patch",
@@ -218,9 +215,6 @@
       "2.2.0 - 2.2.8": "PRODSECBUG-2432__admin_path_disclosure_bug__2.2.0.patch",
       "2.3.0 - 2.3.1": "PRODSECBUG-2432__admin_path_disclosure_bug__2.3.0.patch"
     },
-    "Transaction MD5 hash field is removed by Authorize.net": {
-      "2.2.0 - 2.2.7": "MAGETWO-98129__transaction_field_is_removed_by_authorize_net__2.2.0.patch"
-    },
     "Customer attributes issue": {
       "2.2.6": "MAGETWO-95591__customer_attributes_issue__2.2.6.patch"
     },
@@ -233,14 +227,29 @@
     "Fix for multi-site configuration issue": {
       "2.2.4": "MAGETWO-92926__fix_for_multi-site_configuration_issue__2.2.4.patch"
     },
-    "Fix PayPal issue with region": {
-      "2.3.4": "MC-31387__fix_paypal_issue_with_region__2.3.4.patch"
-    },
     "FPC is getting disabled during deployments": {
       ">=2.3.2 <2.3.5": "MAGECLOUD-5069__fpc_is_getting_disabled_during_deployments__2.3.2.patch",
       ">=2.3.5 <2.4.0": "MAGECLOUD-5069__fpc_is_getting_disabled_during_deployments__2.3.5.patch"
     }
   },
+  "magento/module-paypal": {
+    "Add PayPal TPV codes on checkout": {
+      "~100.1.6": "MAGETWO-53941__fix_enterprise_paypal_codes__100.1.6.patch"
+    },
+    "Fix PayPal issue with region": {
+      "100.3.4": "MC-31387__fix_paypal_issue_with_region__100.3.4.patch"
+    }
+  },
+  "magento/module-authorizenet": {
+    "Transaction MD5 hash field is removed by Authorize.net": {
+      "100.2.0 - 100.2.3": "MAGETWO-98129__transaction_field_is_removed_by_authorize_net__100.2.0.patch"
+    }
+  },
+  "magento/module-braintree": {
+    "Add Braintree TPV codes on checkout": {
+      "~100.1.6": "MAGETWO-53941__fix_enterprise_braintree_code__100.1.6.patch"
+    }
+  },
   "monolog/monolog": {
     "Fix monolog Slack Handler bug for magento 2.1.x": {
       "1.16.0": "MAGECLOUD-2793__fix_monolog_slack_handler_2.1.x.patch"

patches/MAGETWO-53941__fix_enterprise_braintree_code__100.1.6.patch

@@ -0,0 +1,44 @@
+diff -Nuar a/vendor/magento/module-braintree/Gateway/Request/ChannelDataBuilder.php b/vendor/magento/module-braintree/Gateway/Request/ChannelDataBuilder.php
+--- a/vendor/magento/module-braintree/Gateway/Request/ChannelDataBuilder.php
++++ b/vendor/magento/module-braintree/Gateway/Request/ChannelDataBuilder.php
+@@ -26,7 +26,7 @@
+     /**
+      * @var string
+      */
+-    private static $channelValue = 'Magento2_Cart_%s_BT';
++    private static $channelValue = 'Magento_Enterprise_Cloud_BT';
+
+     /**
+      * Constructor
+@@ -44,7 +44,7 @@
+     public function build(array $buildSubject)
+     {
+         return [
+-            self::$channel => sprintf(self::$channelValue, $this->productMetadata->getEdition())
++            self::$channel => self::$channelValue
+         ];
+     }
+ }
+diff -Nuar a/vendor/magento/module-braintree/Test/Unit/Gateway/Request/ChannelDataBuilderTest.php b/vendor/magento/module-braintree/Test/Unit/Gateway/Request/ChannelDataBuilderTest.php
+--- a/vendor/magento/module-braintree/Test/Unit/Gateway/Request/ChannelDataBuilderTest.php
++++ b/vendor/magento/module-braintree/Test/Unit/Gateway/Request/ChannelDataBuilderTest.php
+@@ -40,7 +40,7 @@
+     public function testBuild($edition, array $expected)
+     {
+         $buildSubject = [];
+-        $this->productMetadataMock->expects(static::once())
++        $this->productMetadataMock->expects(static::never())
+             ->method('getEdition')
+             ->willReturn($edition);
+
+@@ -54,8 +54,8 @@
+     public function buildDataProvider()
+     {
+         return [
+-            ['FirstEdition', ['channel' => 'Magento2_Cart_FirstEdition_BT']],
+-            ['SecondEdition', ['channel' => 'Magento2_Cart_SecondEdition_BT']],
++            ['FirstEdition', ['channel' => 'Magento_Enterprise_Cloud_BT']],
++            ['SecondEdition', ['channel' => 'Magento_Enterprise_Cloud_BT']],
+         ];
+     }
+ }

patches/MAGETWO-53941__fix_enterprise_payment_codes__2.1.8.patch

@@ -0,0 +1,41 @@
+diff -Nuar a/vendor/magento/module-paypal/Model/AbstractConfig.php b/vendor/magento/module-paypal/Model/AbstractConfig.php
+--- a/vendor/magento/module-paypal/Model/AbstractConfig.php
++++ b/vendor/magento/module-paypal/Model/AbstractConfig.php
+@@ -59,7 +59,7 @@
+     /**
+      * @var string
+      */
+-    private static $bnCode = 'Magento_Cart_%s';
++    private static $bnCode = 'Magento_Enterprise_Cloud';
+ 
+     /**
+      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+@@ -335,7 +335,7 @@
+      */
+     public function getBuildNotationCode()
+     {
+-        return sprintf(self::$bnCode, $this->getProductMetadata()->getEdition());
++        return self::$bnCode;
+     }
+ 
+     /**
+diff -Nuar a/vendor/magento/module-paypal/Test/Unit/Model/AbstractConfigTest.php b/vendor/magento/module-paypal/Test/Unit/Model/AbstractConfigTest.php
+--- a/vendor/magento/module-paypal/Test/Unit/Model/AbstractConfigTest.php
++++ b/vendor/magento/module-paypal/Test/Unit/Model/AbstractConfigTest.php
+@@ -293,7 +293,7 @@
+     public function testGetBuildNotationCode()
+     {
+         $productMetadata = $this->getMock(ProductMetadataInterface::class, [], [], '', false);
+-        $productMetadata->expects($this->once())
++        $productMetadata->expects($this->never())
+             ->method('getEdition')
+             ->will($this->returnValue('SomeEdition'));
+ 
+@@ -304,6 +304,6 @@
+             $productMetadata
+         );
+ 
+-        $this->assertEquals('Magento_Cart_SomeEdition', $this->config->getBuildNotationCode());
++        $this->assertEquals('Magento_Enterprise_Cloud', $this->config->getBuildNotationCode());
+     }
+ }