Merge pull request #2495 from magento-plankton/2.2-develop-update

Fixed issues:
- MAGETWO-85040 Magento 2.2.3 Publication
- MQE-798 MFTF modules for EE and B2B are missing from composer install
- MAGETWO-89080 [Backport for 2.2.x]Category chooser shows blank block
- MAGETWO-89273 [Dotmailer] Admin Section is not visible in backend on production mode - GitHub issue #14104
- MQE-736 Fail to run robo generate:suite Catalog
- MQE-690 Create a custom action to assert that elements are sorted properly
- MQE-561 [ALLURE] Add an enum to the "Severity" annotation xml schema.
- MQE-802 Make ActionObject list of allowed characters comprehensive
- MQE-526 Do not depend on xml merging by filename-order
- MQE-822 [2.1.0 - Release] Checklist
- MQE-813 Assist DevOps with creation of flag or command for returning test metadata to build
- MQE-842 Update feature and story tags to map to test functions when generated
- MQE-865 Deliver changes to Magento 2 mainline (2.2/2.3)
- MAGETWO-89337 "My Requisition Lists" option is absent in header menu.
- MAGETWO-89261 Template file 'header.html' is not found.
- MAGETWO-89453 "Varnish Configuration" tab does not unfold, when configuring Full Page Cache
- MAGETWO-89248 Category navigation menu is not updated after moving sub category to the same level as parent
- MAGETWO-89538 2.2.4 modal
- MAGETWO-88864 Magento 2.2.4 Publication

Author: slavvka

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

@@ -25,7 +25,7 @@
         "magento/module-theme": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.4",
     "license": [
         "proprietary"
     ],

app/code/Magento/Braintree/composer.json

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