Alternative implementation of #115

goetas · goetas · commit 24257c8ed81e · 2016-08-19T10:30:18.000+02:00
diff --git a/src/HTML5/Serializer/OutputRules.php b/src/HTML5/Serializer/OutputRules.php
@@ -223,6 +223,8 @@ public function element($ele)
             foreach ($ele->childNodes as $child) {
                 if ($child instanceof \DOMCharacterData) {
                     $this->wr($child->data);
+                } elseif ($child instanceof \DOMElement) {
+                    $this->element($child);
                 }
             }
         } else {
diff --git a/test/HTML5/Serializer/OutputRulesTest.php b/test/HTML5/Serializer/OutputRulesTest.php
@@ -627,34 +627,24 @@ public function testHandlingInvalidRawContent()
     {
         $dom = $this->html5->loadHTML(
     '<!doctype html>
-    <html lang="en" id="base">
-        <body>
-            <p>Foo</p>
-            <style id="test">
-                blah
-            </style>
-            <p>Baz</p>
-        </body>
-    </html>');
-
-        // modify the content of the TEXT_RAW element
-        $badNode = $dom->createElement("p");
-        $badNode->appendChild($dom->createTextNode("Bar"));
-
-        $styleElement = $dom->getElementById("test");
+<html lang="en" id="base">
+    <body>
+       <script id="template" type="x-tmpl-mustache">
+           <h1>Hello!</h1>
+       </script>
+    </body>
+</html>');
+
+        $badNode = $dom->createElement("p", "Bar");
+
+        // modify the content of the TEXT_RAW element: <script id="template"> appending dom nodes
+        $styleElement = $dom->getElementById("template");
         $styleElement->appendChild($badNode);
 
-        // create the OutputRules instance and run the tests
-        $stream = fopen('php://temp', 'w');
-        $r = new OutputRules($stream, $this->html5->getOptions());
-        $t = new Traverser($dom, $stream, $r, $this->html5->getOptions());
-
-        $r->element($dom->getElementById('base'));
-        $contents = stream_get_contents($stream, - 1, 0);
-        
-        $this->assertRegExp('|<p>Foo</p>|', $contents);
-        $this->assertNotRegExp('|<p>Bar</p>|', $contents);
-        $this->assertRegExp('|<p>Baz</p>|', $contents);
+        $contents = $this->html5->saveHTML($dom);
 
+        $this->assertTrue(strpos($contents, '<script id="template" type="x-tmpl-mustache">
+           <h1>Hello!</h1>
+       <p>Bar</p></script>')!==false);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,8 @@ public function element($ele)`
`223`	`223`	`foreach ($ele->childNodes as $child) {`
`224`	`224`	`if ($child instanceof \DOMCharacterData) {`
`225`	`225`	`$this->wr($child->data);`
	`226`	`+ } elseif ($child instanceof \DOMElement) {`
	`227`	`+ $this->element($child);`
`226`	`228`	`}`
`227`	`229`	`}`
`228`	`230`	`} else {`