Don't leave behind trailing semicolons when moving imports to top

Fixes #240
matthiasmullie · Apr 4, 2018 · 81d3a80 · 81d3a80
1 parent 473896b
commit 81d3a80
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/CSS.php b/src/CSS.php
@@ -86,7 +86,7 @@ public function setImportExtensions(array $extensions)
      */
     protected function moveImportsToTop($content)
     {
-        if (preg_match_all('/(;?)(@import (?<url>url\()?(?P<quotes>["\']?).+?(?P=quotes)(?(url)\)))/', $content, $matches)) {
+        if (preg_match_all('/(;?)(@import (?<url>url\()?(?P<quotes>["\']?).+?(?P=quotes)(?(url)\)));?/', $content, $matches)) {
             // remove from content
             foreach ($matches[0] as $import) {
                 $content = str_replace($import, '', $content);

diff --git a/tests/css/CSSTest.php b/tests/css/CSSTest.php
@@ -712,6 +712,20 @@ public function dataProvider()
             '#site-header.medium-header .top-col.logo-col{-webkit-flex:auto 0 0;flex:auto 0 0}',
         );
 
+        // https://github.com/matthiasmullie/minify/issues/240
+        $tests[] = array(
+            'p{color:red}
+@import url("http://minify.dev/?a=1&amp;b=some/*lala*/thing");
+body{font-family:sans-serif}',
+            '@import url(http://minify.dev/?a=1&amp;b=some/*lala*/thing);p{color:red}body{font-family:sans-serif}',
+        );
+        $tests[] = array(
+            'p{color:red}
+@import url("http://minify.dev/?a=1&amp;b=some/*lala*/thing") ;
+body{font-family:sans-serif}',
+            '@import url(http://minify.dev/?a=1&amp;b=some/*lala*/thing);p{color:red}body{font-family:sans-serif}',
+        );
+
         return $tests;
     }