Merge pull request #2217 from magento-tsg/2.1.13-develop-pr48

[TSG] Backporting for 2.1 (pr48) (2.1.13)

Author: Alexander Akimov

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

@@ -198,7 +198,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);
@@ -213,6 +215,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/Catalog/Model/Category/Attribute/Backend/Image.php

@@ -52,11 +52,6 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      */
     private $imageUploader;
 
-    /**
-     * @var string
-     */
-    private $additionalData = '_additional_data_';
-
     /**
      * Image constructor.
      *
@@ -85,9 +80,9 @@ public function beforeSave($object)
     {
         $attributeName = $this->getAttribute()->getName();
         $value = $object->getData($attributeName);
+        $imageName = $this->getUploadedImageName($value);
 
-        if ($imageName = $this->getUploadedImageName($value)) {
-            $object->setData($this->additionalData . $attributeName, $value);
+        if ($imageName) {
             $object->setData($attributeName, $imageName);
         } else if (!is_string($value)) {
             $object->setData($attributeName, '');
@@ -130,27 +125,15 @@ private function getImageUploader()
     }
 
     /**
-     * Check if temporary file is available for new image upload.
-     *
-     * @param array $value
-     * @return bool
-     */
-    private function isTmpFileAvailable($value)
-    {
-        return is_array($value) && isset($value[0]['tmp_name']);
-    }
-
-    /**
-     * Save uploaded file and set its name to category
+     * Save uploaded file and set its name to category.
      *
      * @param \Magento\Framework\DataObject $object
      * @return \Magento\Catalog\Model\Category\Attribute\Backend\Image
      */
     public function afterSave($object)
     {
-        $value = $object->getData($this->additionalData . $this->getAttribute()->getName());
-
-        if ($this->isTmpFileAvailable($value) && $imageName = $this->getUploadedImageName($value)) {
+        $imageName = $object->getData($this->getAttribute()->getName(), null);
+        if ($imageName) {
             try {
                 $this->getImageUploader()->moveFileFromTmp($imageName);
             } catch (\Exception $e) {

app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/ImageTest.php

@@ -164,8 +164,7 @@ public function testAfterSave()
 
         $object = new \Magento\Framework\DataObject(
             [
-                'test_attribute' => 'test1234.jpg',
-                '_additional_data_test_attribute' => [['name' => 'test1234.jpg', 'tmp_name' => 'test-test-1234']]
+                'test_attribute' => 'test1234.jpg'
             ]
         );
         $model->afterSave($object);
@@ -208,7 +207,7 @@ public function testAfterSaveWithExceptions()
             ->with($this->equalTo($exception));
         $object = new \Magento\Framework\DataObject(
             [
-                '_additional_data_test_attribute' => [['name' => 'test1234.jpg', 'tmp_name' => 'test-test-1234']]
+                'test_attribute' => 'test1234.jpg'
             ]
         );
         $model->afterSave($object);

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

@@ -75,6 +75,9 @@ public function testGetUrl()
         ];
         $url = $this->_model->getUrl('path', $routeParams);
         $this->assertContains('/param4/' . $paramEncoder->encode('a4==') . '/', $url);
+
+        $url = $this->_model->getUrl('route/controller/action/id/100');
+        $this->assertContains('id/100', $url);
     }
 
     /**