Merge remote-tracking branch 'mainline/2.2-develop' into DEVOPS-2174-2.2

Author: slavvka

.travis.yml

@@ -19,7 +19,7 @@ env:
   global:
     - COMPOSER_BIN_DIR=~/bin
     - INTEGRATION_SETS=3
-    - NODE_JS_VERSION=6
+    - NODE_JS_VERSION=8
     - MAGENTO_HOST_NAME="magento2.travis"
   matrix:
     - TEST_SUITE=unit

CHANGELOG.md

@@ -11,7 +11,7 @@
         "lib-libxml": "*"
     },
     "type": "magento2-module",
-    "version": "100.2.1",
+    "version": "100.2.2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/AdminNotification/composer.json

@@ -13,7 +13,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.1",
+    "version": "100.2.2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -10,7 +10,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0",
+    "version": "100.2.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Analytics/composer.json

@@ -211,7 +211,9 @@ public function getUrl($routePath = null, $routeParams = null)
             return $result;
         }
 
+        $this->getRouteParamsResolver()->unsetData('route_params');
         $this->_setRoutePath($routePath);
+        $extraParams = $this->getRouteParamsResolver()->getRouteParams();
         $routeName = $this->_getRouteName('*');
         $controllerName = $this->_getControllerName(self::DEFAULT_CONTROLLER_NAME);
         $actionName = $this->_getActionName(self::DEFAULT_ACTION_NAME);
@@ -226,6 +228,10 @@ public function getUrl($routePath = null, $routeParams = null)
             $routeParams[self::SECRET_KEY_PARAM_NAME] = $secretKey;
         }
 
+        if (!empty($extraParams)) {
+            $routeParams = array_merge($extraParams, $routeParams);
+        }
+
         return parent::getUrl("{$routeName}/{$controllerName}/{$actionName}", $routeParams);
     }
 

app/code/Magento/Backend/Model/Url.php

@@ -24,7 +24,7 @@
         "magento/module-theme": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backend/composer.json

@@ -145,9 +145,6 @@
                 <item name="dev" xsi:type="const">Magento\Config\Model\Config\Structure\ElementVisibilityInterface::HIDDEN</item>
                 <item name="general/locale/code" xsi:type="const">Magento\Config\Model\Config\Structure\ElementVisibilityInterface::DISABLED</item>
             </argument>
-            <argument name="exemptions" xsi:type="array">
-                <item name="dev/debug/debug_logging" xsi:type="string"/>
-            </argument>
         </arguments>
     </type>
     <type name="Magento\Framework\View\Layout\Generator\Block">

app/code/Magento/Backend/etc/adminhtml/di.xml

@@ -9,7 +9,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backup/composer.json

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Gateway\Response;
+
+use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Payment\Gateway\Response\HandlerInterface;
+use Magento\Sales\Model\Order\Payment;
+
+/**
+ * Handles response details for order cancellation request.
+ */
+class CancelDetailsHandler implements HandlerInterface
+{
+    /**
+     * @var SubjectReader
+     */
+    private $subjectReader;
+
+    /**
+     * @param SubjectReader $subjectReader
+     */
+    public function __construct(SubjectReader $subjectReader)
+    {
+        $this->subjectReader = $subjectReader;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function handle(array $handlingSubject, array $response)
+    {
+        $paymentDO = $this->subjectReader->readPayment($handlingSubject);
+        /** @var Payment $orderPayment */
+        $orderPayment = $paymentDO->getPayment();
+        $orderPayment->setIsTransactionClosed(true);
+        $orderPayment->setShouldCloseParentTransaction(true);
+    }
+}