Merge remote-tracking branch 'origin/MAGETWO-67162' into 2.1-develop-pr54

Author: DianaRusin

app/code/Magento/UrlRewrite/Block/Catalog/Product/Edit.php

@@ -55,7 +55,7 @@ protected function _prepareLayoutFeatures()
         }
 
         if ($this->_getProduct()->getId()) {
-            $this->_addProductLinkBlock($this->_getProduct());
+            $this->_addProductLinkBlock();
         }
 
         if ($this->_getCategory()->getId()) {

app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php

@@ -39,7 +39,7 @@ class Generator extends AbstractSchemaGenerator
     const UNAUTHORIZED_DESCRIPTION = '401 Unauthorized';
 
     /** Array signifier */
-    const ARRAY_SIGNIFIER = '[]';
+    const ARRAY_SIGNIFIER = '[0]';
 
     /**
      * Swagger factory instance.

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

@@ -188,8 +188,8 @@ public function toArray($arrRequiredFields = [])
     }
 
     /**
-     * @param null $valueField
-     * @param null $labelField
+     * @param string|null $valueField
+     * @param string|null $labelField
      * @param array $additional
      * @return array
      */