Merge pull request #2690 from magento-tsg/2.1-develop-pr54

[TSG] Backporting for 2.1 (pr54) (2.1.15)

Author: Alexander Akimov

app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php

@@ -32,7 +32,10 @@ public function execute()
         $aclResource = $component->getData('acl');
 
         if ($aclResource && !$this->_authorization->isAllowed($aclResource)) {
-            $this->_redirect('admin/noroute');
+            if (!$this->_request->isAjax()) {
+                $this->_redirect('admin/noroute');
+            }
+
             return;
         }
 

app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php

@@ -149,6 +149,15 @@ public function testExecuteAjaxRequestWithoutPermissions($acl, $isAllowed)
             ->method('getParam')
             ->with('namespace')
             ->willReturn($name);
+
+        if ($isAllowed === false) {
+            $this->requestMock->expects($this->once())
+                ->method('isAjax')
+                ->willReturn(true);
+        }
+
+        $this->responseMock->expects($this->never())
+            ->method('setRedirect');
         $this->responseMock->expects($this->any())
             ->method('appendBody')
             ->with($renderedData);

app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js

@@ -304,7 +304,7 @@ define([
 
             if (allowed.passed) {
                 target.on('fileuploadsend', function (event, postData) {
-                    postData.data.set('param_name', this.paramName);
+                    postData.data.append('param_name', this.paramName);
                     $(event.currentTarget).off('fileuploadsend');
                 }.bind(data));
 

composer.json

@@ -40,7 +40,7 @@
         "monolog/monolog": "1.16.0",
         "oyejorge/less.php": "~1.7.0",
         "pelago/emogrifier": "0.1.1",
-        "tubalmartin/cssmin": "2.4.8-p4",
+        "tubalmartin/cssmin": "3.0.0",
         "magento/magento-composer-installer": "*",
         "braintree/braintree_php": "3.7.0",
         "symfony/console": "~2.3 <2.7",

composer.lock

@@ -6116,3 +6116,9 @@ table tfoot tr td:last-child {
   content: ' Test\';\A}' "\A" '\A.test + .test._other ~ ul > li' " {\A    height: @var;\A    content: ' + ';\A}";
   white-space: pre;
 }
+.test-content-calc {
+  width: calc((100% / 12 * 2) - 10px);
+}
+.test-svg-xml-image {
+  background:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" viewBox="0 0 38 40"><style>.st0{fill:none;stroke:%23ffffff;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}</style><circle cx="14.7" cy="14.7" r="13.7" class="st0"/><path d="M23.9 24.7L37 39" class="st0"/></svg>') no-repeat left center;
+}

dev/tests/integration/testsuite/Magento/Framework/View/_files/static/expected/styles.magento.min.css

@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Code\Minifier\Adapter\Css;
 
-use CSSmin as CssMinLibrary;
+use tubalmartin\CssMin\Minifier as CssMinLibrary;
 use Magento\Framework\Code\Minifier\AdapterInterface;
 
 /**
@@ -35,12 +35,12 @@ public function __construct(CssMinLibrary $cssMinifier)
     /**
      * Get CSS Minifier
      *
-     * @return \CSSMin
+     * @return CssMinLibrary
      */
     private function getCssMin()
     {
-        if (!($this->cssMinifier instanceof \CSSMin)) {
-            $this->cssMinifier = new \CSSmin(false);
+        if (!($this->cssMinifier instanceof CssMinLibrary)) {
+            $this->cssMinifier = new CssMinLibrary(false);
         }
         return $this->cssMinifier;
     }

dev/tests/integration/testsuite/Magento/Framework/View/_files/static/theme/web/css/styles.css

@@ -9,7 +9,7 @@ class CssMinTest extends \PHPUnit_Framework_TestCase
 {
     public function testMinify()
     {
-        $cssMinMock = $this->getMockBuilder(\CSSmin::class)
+        $cssMinMock = $this->getMockBuilder(\tubalmartin\CssMin\Minifier::class)
             ->disableOriginalConstructor()
             ->getMock();
         $cssMinAdapter = new \Magento\Framework\Code\Minifier\Adapter\Css\CSSmin($cssMinMock);

lib/internal/Magento/Framework/Code/Minifier/Adapter/Css/CSSmin.php

@@ -160,11 +160,12 @@ public function renderResult(ResponseInterface $response)
         \Magento\Framework\Profiler::start('LAYOUT');
         \Magento\Framework\Profiler::start('layout_render');
 
+        $this->eventManager->dispatch('layout_render_before');
+        $this->eventManager->dispatch('layout_render_before_' . $this->request->getFullActionName());
+
         $this->applyHttpHeaders($response);
         $this->render($response);
 
-        $this->eventManager->dispatch('layout_render_before');
-        $this->eventManager->dispatch('layout_render_before_' . $this->request->getFullActionName());
         \Magento\Framework\Profiler::stop('layout_render');
         \Magento\Framework\Profiler::stop('LAYOUT');
         return $this;