Merge remote-tracking branch 'origin/MAGETWO-93306-minify_exclude' into 2.3-regression-pr-HB

Author: cpartica

lib/internal/Magento/Framework/View/Asset/Minification.php

@@ -162,7 +162,16 @@ public function getExcludes($contentType)
     private function getMinificationExcludeValues($key)
     {
         $configValues = $this->scopeConfig->getValue($key, $this->scope) ?? [];
-
+        //value used to be a string separated by 'newline' separator so we need to convert it to array
+        if (!is_array($configValues)) {
+            $configValuesFromString = [];
+            foreach (explode("\n", $configValues) as $exclude) {
+                if (trim($exclude) != '') {
+                    $configValuesFromString[] = trim($exclude);
+                }
+            }
+            $configValues = $configValuesFromString;
+        }
         return array_values($configValues);
     }
 }

lib/internal/Magento/Framework/View/Test/Unit/Asset/MinificationTest.php

@@ -195,6 +195,8 @@ public function isMinifiedFilenameDataProvider()
     }
 
     /**
+     * Test dev/js/minify_exclude system value as array
+     *
      * @return void
      */
     public function testGetExcludes()
@@ -213,4 +215,39 @@ public function testGetExcludes()
         /** check cache: */
         $this->assertEquals($expected, $this->minification->getExcludes('js'));
     }
+
+    /**
+     * Test dev/js/minify_exclude system value backward compatibility when value was a string
+     *
+     * @param string $value
+     * @param array $expectedValue
+     * @return void
+     *
+     * @dataProvider getExcludesTinyMceAsStringDataProvider
+     */
+    public function testGetExcludesTinyMceAsString(string $value, array $expectedValue)
+    {
+        $this->scopeConfigMock
+            ->expects($this->once())
+            ->method('getValue')
+            ->with('dev/js/minify_exclude')
+            ->willReturn($value);
+
+        $this->assertEquals($expectedValue, $this->minification->getExcludes('js'));
+        /** check cache: */
+        $this->assertEquals($expectedValue, $this->minification->getExcludes('js'));
+    }
+
+
+    /**
+     * @return array
+     */
+    public function getExcludesTinyMceAsStringDataProvider()
+    {
+        return [
+            ["/tiny_mce/  \n  /tiny_mce2/", ['/tiny_mce/', '/tiny_mce2/']],
+            ['/tiny_mce/', ['/tiny_mce/']],
+            [' /tiny_mce/', ['/tiny_mce/']],
+        ];
+    }
 }