Merge pull request #2228 from magento-tsg/2.2.4-develop-pr21

[TSG] Backporting for 2.2 (pr21) (2.2.4)

Author: Alexander Akimov

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

@@ -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);
     }
 

dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php

@@ -37,16 +37,21 @@ protected function setUp()
     /**
      * App isolation is enabled to protect next tests from polluted registry by getUrl().
      *
+     * @param string $routePath
      * @param array $requestParams
      * @param string $expectedResult
      * @param array|null $routeParams
      * @dataProvider getUrlDataProvider
      * @magentoAppIsolation enabled
      */
-    public function testGetUrl(array $requestParams, string $expectedResult, array $routeParams = null)
-    {
+    public function testGetUrl(
+        string $routePath,
+        array $requestParams,
+        string $expectedResult,
+        array $routeParams = null
+    ) {
         $this->request->setParams($requestParams);
-        $url = $this->_model->getUrl('adminhtml/auth/login', $routeParams);
+        $url = $this->_model->getUrl($routePath, $routeParams);
         $this->assertContains($expectedResult, $url);
     }
 
@@ -62,10 +67,12 @@ public function getUrlDataProvider()
 
         return [
             [
+                'routePath' => 'adminhtml/auth/login',
                 'requestParams' => [],
                 'expectedResult'=> 'admin/auth/login/key/',
             ],
             [
+                'routePath' => 'adminhtml/auth/login',
                 'requestParams' => [],
                 'expectedResult'=> '/param1/a1==/',
                 'routeParams' => [
@@ -74,6 +81,7 @@ public function getUrlDataProvider()
                 ],
             ],
             [
+                'routePath' => 'adminhtml/auth/login',
                 'requestParams' => [],
                 'expectedResult'=> '/param1/a1==/',
                 'routeParams' => [
@@ -82,6 +90,7 @@ public function getUrlDataProvider()
                 ],
             ],
             [
+                'routePath' => 'adminhtml/auth/login',
                 'requestParams' => ['param2' => 'a2=='],
                 'expectedResult'=> '/param2/a2==/',
                 'routeParams' => [
@@ -90,6 +99,7 @@ public function getUrlDataProvider()
                 ],
             ],
             [
+                'routePath' => 'adminhtml/auth/login',
                 'requestParams' => [],
                 'expectedResult' => '/param3/' . $escaper->encodeUrlParam('a3==') . '/',
                 'routeParams' => [
@@ -98,13 +108,19 @@ public function getUrlDataProvider()
                 ],
             ],
             [
+                'routePath' => 'adminhtml/auth/login',
                 'requestParams' => ['param4' => 'a4=='],
                 'expectedResult' => '/param4/' . $escaper->encodeUrlParam('a4==') . '/',
                 'routeParams' => [
                     '_current' => true,
                     '_escape_params' => true,
                 ],
             ],
+            [
+                'routePath' => 'route/controller/action/id/100',
+                'requestParams' => [],
+                'expectedResult' => 'id/100',
+            ],
         ];
     }