Universal selector can follow a comment (#32)

Fixes #31. Related: wintercms/winter#325
assetic-php · May 9, 2022 · f5fd341 · f5fd341
1 parent 895fd7e
commit f5fd341
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Assetic/Filter/StylesheetMinifyFilter.php b/src/Assetic/Filter/StylesheetMinifyFilter.php
@@ -29,7 +29,7 @@ protected function minify($css)
         $css = preg_replace('/(\s+)(\/\*[^!](.*?)\*\/)(\s+)/', '$2', $css);
 
         // Remove comment blocks, everything between /* and */, ignore /*! comments
-        $css = preg_replace('#/\*[^\!].*?\*/#s', '', $css);
+        $css = preg_replace('#/\*[^(\!|,|{)].*?\*/#s', '', $css);
 
         // Remove ; before }
         $css = preg_replace('/;(?=\s*})/', '', $css);

diff --git a/tests/Assetic/Test/Filter/StylesheetMinifyFilterTest.php b/tests/Assetic/Test/Filter/StylesheetMinifyFilterTest.php
@@ -58,6 +58,18 @@ public function testSpecialCommentPreservation()
         $this->assertEquals($output, $mockAsset->getContent());
     }
 
+    public function testUniversalSelectorFollowComment()
+    {
+        $input  = '/*! Keep me */*{box-sizing:border-box}/* Remove me */.noborder{border:0}';
+        $output = '/*! Keep me */*{box-sizing:border-box}.noborder{border:0}';
+
+        $mockAsset = new MockAsset($input);
+        $result = new StylesheetMinifyFilter();
+        $result->filterDump($mockAsset);
+
+        $this->assertEquals($output, $mockAsset->getContent());
+    }
+
     public function testCommentRemoval()
     {
         $input  = 'body{/* First comment */} /* Second comment */';