html_entity_decode() clears the DOM entities

src/CssToInlineStyles.php

@@ -129,6 +129,20 @@ protected function getHtmlFromDocument(\DOMDocument $document)
             $xml
         );
 
+        /*
+         * Replace entities such as < > with adding extra &
+         * but ignores entities with & following by # such as d
+         * so < will become <
+         * after calling html_entity_decode() < will stay < etc.
+         */
+        $replace = array(
+            '<' => '<',
+            '>' => '>',
+        );
+        $html = str_replace(array_keys($replace), array_values($replace), $html);
+        $html = preg_replace('~(&)([^\#])~', '&$2', $html);
+        $html = html_entity_decode($html, ENT_COMPAT | ENT_HTML401, 'UTF-8');
+
         return ltrim($html);
     }
 

tests/CssToInlineStylesTest.php

@@ -200,10 +200,23 @@ public function testInvalidSelector()
 
     public function testHtmlEncoding()
     {
-        $text = 'Žluťoučký kůň pije pivo nebo jak to je dál';
-        $expectedText = 'Žluťoučký kůň pije pivo nebo jak to je dál';
+        $text = $expectedText = 'Žluťoučký kůň pije pivo nebo jak to je dál @ €';
 
-        $this->assertEquals($expectedText, trim(strip_tags($this->cssToInlineStyles->convert($text, ''))));
+        $this->assertEquals($expectedText, trim(strip_tags($this->cssToInlineStyles->convert($text))));
+    }
+
+    public function testSpecialCharacters()
+    {
+        $text = $expectedText = '1 < 2';
+
+        $this->assertEquals($expectedText, trim(strip_tags($this->cssToInlineStyles->convert($text))));
+    }
+
+    public function testSpecialCharactersExplicit()
+    {
+        $text = $expectedText = '<script&>';
+
+        $this->assertEquals($expectedText, trim(strip_tags($this->cssToInlineStyles->convert($text))));
     }
 
     private function assertCorrectConversion($expected, $html, $css = null)