MAGETWO-83094: Products Orderd Report exported CSV is empty

Author: dhorytskyi

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

@@ -188,8 +188,12 @@ public function getUrl($routePath = null, $routeParams = null)
             return $routePath;
         }
 
+        if (!is_array($routeParams)) {
+            $routeParams = [];
+        }
+
         $cacheSecretKey = false;
-        if (is_array($routeParams) && isset($routeParams['_cache_secret_key'])) {
+        if (isset($routeParams['_cache_secret_key'])) {
             unset($routeParams['_cache_secret_key']);
             $cacheSecretKey = true;
         }
@@ -202,22 +206,12 @@ public function getUrl($routePath = null, $routeParams = null)
         $routeName = $this->_getRouteName('*');
         $controllerName = $this->_getControllerName(self::DEFAULT_CONTROLLER_NAME);
         $actionName = $this->_getActionName(self::DEFAULT_ACTION_NAME);
-        if ($cacheSecretKey) {
-            $secret = [self::SECRET_KEY_PARAM_NAME => "\${$routeName}/{$controllerName}/{$actionName}\$"];
-        } else {
-            $secret = [
-                self::SECRET_KEY_PARAM_NAME => $this->getSecretKey($routeName, $controllerName, $actionName),
-            ];
-        }
-        if (is_array($routeParams)) {
-            $routeParams = array_merge($secret, $routeParams);
-        } else {
-            $routeParams = $secret;
-        }
-        if (is_array($this->_getRouteParams())) {
-            $routeParams = array_merge($this->_getRouteParams(), $routeParams);
+        if (!isset($routeParams[self::SECRET_KEY_PARAM_NAME])) {
+            $secretKey = $cacheSecretKey
+                ? "\${$routeName}/{$controllerName}/{$actionName}\$"
+                : $this->getSecretKey($routeName, $controllerName, $actionName);
+            $routeParams[self::SECRET_KEY_PARAM_NAME] = $secretKey;
         }
-        $routeParams['_escape_params'] = false;
 
         return parent::getUrl("{$routeName}/{$controllerName}/{$actionName}", $routeParams);
     }

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

@@ -5,6 +5,12 @@
  */
 namespace Magento\Backend\Model;
 
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Url\ParamEncoder;
+use Magento\Framework\Session\SessionManagerInterface;
+use Magento\Framework\Encryption\EncryptorInterface;
+
 /**
  * Test class for \Magento\Backend\Model\UrlInterface.
  *
@@ -13,16 +19,19 @@
 class UrlTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Backend\Model\UrlInterface
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @var UrlInterface
      */
     protected $_model;
 
     protected function setUp()
     {
-        parent::setUp();
-        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Backend\Model\UrlInterface'
-        );
+        $this->request = Bootstrap::getObjectManager()->get(RequestInterface::class);
+        $this->_model = Bootstrap::getObjectManager()->create(UrlInterface::class);
     }
 
     /**
@@ -34,6 +43,16 @@ public function testGetUrl()
     {
         $url = $this->_model->getUrl('adminhtml/auth/login');
         $this->assertContains('admin/auth/login/key/', $url);
+
+        $this->request->setParams(['param' => 'ab==']);
+        $routeParams = [
+            '_current' => true,
+            '_escape_params' => true,
+        ];
+        $url = $this->_model->getUrl('path', $routeParams);
+        /** @var ParamEncoder $paramEncoder */
+        $paramEncoder = Bootstrap::getObjectManager()->get(ParamEncoder::class);
+        $this->assertContains('/param/' . $paramEncoder->encode('ab==') . '/', $url);
     }
 
     /**
@@ -46,20 +65,17 @@ public function testGetUrl()
      */
     public function testGetSecretKey($routeName, $controller, $action, $expectedHash)
     {
-        /** @var $request \Magento\Framework\App\RequestInterface */
-        $request = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create('Magento\Framework\App\RequestInterface');
-        $request->setControllerName(
+        $this->request->setControllerName(
             'default_controller'
         )->setActionName(
             'default_action'
         )->setRouteName(
             'default_router'
         );
 
-        $this->_model->setRequest($request);
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Session\SessionManagerInterface'
+        $this->_model->setRequest($this->request);
+        Bootstrap::getObjectManager()->get(
+            SessionManagerInterface::class
         )->setData(
             '_form_key',
             'salt'
@@ -72,10 +88,8 @@ public function testGetSecretKey($routeName, $controller, $action, $expectedHash
      */
     public function getSecretKeyDataProvider()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        /** @var $encryptor \Magento\Framework\Encryption\EncryptorInterface */
-        $encryptor = $objectManager->get('Magento\Framework\Encryption\EncryptorInterface');
+        /** @var $encryptor EncryptorInterface */
+        $encryptor = Bootstrap::getObjectManager()->get(EncryptorInterface::class);
 
         return [
             [
@@ -129,19 +143,14 @@ public function getSecretKeyDataProvider()
      */
     public function testGetSecretKeyForwarded()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        /** @var $encryptor \Magento\Framework\Encryption\EncryptorInterface */
-        $encryptor = $objectManager->get('Magento\Framework\Encryption\EncryptorInterface');
+        /** @var $encryptor EncryptorInterface */
+        $encryptor = Bootstrap::getObjectManager()->get(EncryptorInterface::class);
 
-        /** @var $request \Magento\Framework\App\Request\Http */
-        $request = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create('Magento\Framework\App\RequestInterface');
-        $request->setControllerName('controller')->setActionName('action');
-        $request->initForward()->setControllerName(uniqid())->setActionName(uniqid());
-        $this->_model->setRequest($request);
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Session\SessionManagerInterface'
+        $this->request->setControllerName('controller')->setActionName('action');
+        $this->request->initForward()->setControllerName(uniqid())->setActionName(uniqid());
+        $this->_model->setRequest($this->request);
+        Bootstrap::getObjectManager()->get(
+            SessionManagerInterface::class
         )->setData(
             '_form_key',
             'salt'