Merge branch 'magento:develop' into patches-json-format

Author: peterjaap

.travis.yml

@@ -2,7 +2,7 @@
     "name": "magento/magento-cloud-patches",
     "description": "Provides critical fixes for Magento 2 Enterprise Edition",
     "type": "magento2-component",
-    "version": "1.0.17",
+    "version": "1.0.19",
     "license": "OSL-3.0",
     "repositories": {
         "repo.magento.com": {
@@ -15,12 +15,12 @@
         "ext-json": "*",
         "composer/composer": "@stable",
         "composer/semver": "@stable",
-        "symfony/config": "^3.3||^4.4||^5.1",
-        "symfony/console": "^2.6||^4.0||^5.1",
-        "symfony/dependency-injection": "^3.3||^4.3||^5.1",
-        "symfony/process": "^2.1||^4.1||^5.1",
-        "symfony/proxy-manager-bridge": "^3.3||^4.3||^5.1",
-        "symfony/yaml": "^3.3||^4.0||^5.1",
+        "symfony/config": "^3.3||^4.4||^5.0",
+        "symfony/console": "^2.6||^4.0||^5.0",
+        "symfony/dependency-injection": "^3.3||^4.3||^5.0",
+        "symfony/process": "^2.1||^4.1||^5.0",
+        "symfony/proxy-manager-bridge": "^3.3||^4.3||^5.0",
+        "symfony/yaml": "^3.3||^4.0||^5.0",
         "monolog/monolog": "^1.25||^2.3",
         "magento/quality-patches": "^1.1.0"
     },

composer.json

@@ -345,6 +345,9 @@
   "paypal/module-braintree-core": {
     "Fix Braintree Settlement report error": {
       "4.1.0": "BUNDLE-2683__braintree_settlement_report_fix__4.1.0.patch"
+    },
+    "Fix creating orders when Braintree is enabled": {
+      "4.4.0": "BUNDLE-3137__braintree_create_order_fix__2.4.5.patch"
     }
   },
   "magento/magento2-b2b-base": {

patches.json

@@ -0,0 +1,20 @@
+diff -Nuar a/vendor/paypal/module-braintree-core/Block/Form.php b/vendor/paypal/module-braintree-core/Block/Form.php
+index 4bc1bdf1..70559bbe 100755
+--- a/vendor/paypal/module-braintree-core/Block/Form.php
++++ b/vendor/paypal/module-braintree-core/Block/Form.php
+@@ -66,6 +66,7 @@ public function __construct(
+         GatewayConfig $gatewayConfig,
+         CcType $ccType,
+         LoggerInterface $logger,
++        Data $paymentDataHelper,
+         array $data = []
+     ) {
+         parent::__construct($context, $paymentConfig, $data);
+@@ -74,6 +75,7 @@ public function __construct(
+         $this->gatewayConfig = $gatewayConfig;
+         $this->ccType = $ccType;
+         $this->logger = $logger;
++        $this->paymentDataHelper = $paymentDataHelper;
+     }
+ 
+     /**

patches/BUNDLE-3137__braintree_create_order_fix__2.4.5.patch

@@ -50,6 +50,8 @@ protected function patchesDataProvider(): array
     {
         return [
             ['templateVersion' => '2.4.4'],
+            ['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p1'],
+            ['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5'],
         ];
     }
 }