Merge pull request #65 from WyriHaximus/fix-62

Strip CSS comments from <style> tags
WyriHaximus · Sep 8, 2019 · d1d2f1b · d1d2f1b
2 parents 92e31e8 + fe2ac77
commit d1d2f1b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/src/Pattern/Style.php b/src/Pattern/Style.php
@@ -8,6 +8,11 @@
 
 final class Style implements PatternInterface
 {
+    private const ZERO = 0;
+    private const CSS_COMMENT_OPEN = '<!--';
+    private const CSS_COMMENT_OPEN_LENGTH = 4;
+    private const CSS_COMMENT_CLOSE = '-->';
+
     /** @var CompressorInterface */
     private $compressor;
 
@@ -25,6 +30,7 @@ public function compress(SimpleHtmlDomInterface $element): void
     {
         /** @var string $innerHtml */
         $innerHtml = $element->innerhtml;
+        $innerHtml = $this->stripComments($innerHtml);
         $compressedInnerHtml = $this->compressor->compress($innerHtml);
 
         if ($compressedInnerHtml === '') {
@@ -37,4 +43,18 @@ public function compress(SimpleHtmlDomInterface $element): void
 
         $element->innerhtml = $compressedInnerHtml;
     }
+
+    private function stripComments(string $contents): string
+    {
+        if (\strpos($contents, self::CSS_COMMENT_OPEN) === self::ZERO) {
+            $contents = \substr($contents, self::CSS_COMMENT_OPEN_LENGTH);
+        }
+
+        $pos = \strpos($contents, self::CSS_COMMENT_CLOSE);
+        if ($pos !== false) {
+            $contents = \substr($contents, self::ZERO, $pos);
+        }
+
+        return $contents;
+    }
 }
diff --git a/tests/EdgeCases/css-wrapped-in-comments/in.html b/tests/EdgeCases/css-wrapped-in-comments/in.html
@@ -0,0 +1,7 @@
+<style>
+    <!--
+h1 {
+    color: red;
+}
+-->
+</style>
diff --git a/tests/EdgeCases/css-wrapped-in-comments/out.html b/tests/EdgeCases/css-wrapped-in-comments/out.html
@@ -0,0 +1 @@
+<style>h1{color:red}</style>