Merge pull request #127 from mdio/master

Added @charset removal to doCleanup() to fix processing stylesheets with @charset
tijsverkoyen · Jul 20, 2016 · b081b74 · b081b74
2 parents 2ebaccb + 448a1df
commit b081b74
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/Css/Processor.php b/src/Css/Processor.php
@@ -49,6 +49,8 @@ public function getCssFromStyleTags($html)
      */
     private function doCleanup($css)
     {
+        // remove charset
+        $css = preg_replace('/@charset "[^"]+";/', '', $css);
         // remove media queries
         $css = preg_replace('/@media [^{]*{([^{}]|{[^{}]*})*}/', '', $css);
 

diff --git a/tests/Css/ProcessorTest.php b/tests/Css/ProcessorTest.php
@@ -87,6 +87,26 @@ public function testMakeSureMediaQueriesAreRemoved()
         $this->assertEmpty($this->processor->getRules($css));
     }
 
+    public function testCssWithCharset()
+    {
+        $css = <<<EOF
+@charset "UTF-8";
+a {
+  color: red;
+}
+EOF;
+
+        $rules = $this->processor->getRules($css);
+
+        $this->assertCount(1, $rules);
+        $this->assertInstanceOf('TijsVerkoyen\CssToInlineStyles\Css\Rule\Rule', $rules[0]);
+        $this->assertEquals('a', $rules[0]->getSelector());
+        $this->assertCount(1, $rules[0]->getProperties());
+        $this->assertEquals('color', $rules[0]->getProperties()[0]->getName());
+        $this->assertEquals('red', $rules[0]->getProperties()[0]->getValue());
+        $this->assertEquals(1, $rules[0]->getOrder());
+    }
+
     public function testSimpleStyleTagsInHtml()
     {
         $expected = 'p { color: #F00; }' . "\n";