Merge pull request #117 from Masterminds/downsider-bugfix-outputrules-notice

goetas · web-flow · commit c7a66e05e7ed · 2016-09-22T12:20:25.000+02:00
Fix PHP Notice in OutputRules
diff --git a/src/HTML5/Serializer/OutputRules.php b/src/HTML5/Serializer/OutputRules.php
@@ -221,7 +221,11 @@ public function element($ele)
         $this->openTag($ele);
         if (Elements::isA($name, Elements::TEXT_RAW)) {
             foreach ($ele->childNodes as $child) {
-                $this->wr($child->data);
+                if ($child instanceof \DOMCharacterData) {
+                    $this->wr($child->data);
+                } elseif ($child instanceof \DOMElement) {
+                    $this->element($child);
+                }
             }
         } else {
             // Handle children.
diff --git a/test/HTML5/Serializer/OutputRulesTest.php b/test/HTML5/Serializer/OutputRulesTest.php
@@ -3,6 +3,7 @@
 
 use Masterminds\HTML5\Serializer\OutputRules;
 use Masterminds\HTML5\Serializer\Traverser;
+use Masterminds\HTML5;
 
 class OutputRulesTest extends \Masterminds\HTML5\Tests\TestCase
 {
@@ -18,6 +19,11 @@ class OutputRulesTest extends \Masterminds\HTML5\Tests\TestCase
       </body>
     </html>';
 
+    /**
+     * @var HTML5
+     */
+    protected $html5;
+
     public function setUp()
     {
         $this->html5 = $this->getInstance();
@@ -29,7 +35,7 @@ public function setUp()
      * @param string $name
      *            The name of the method on the Traverser class to test.
      *
-     * @return \ReflectionMethod \ReflectionMethod for the specified method
+     * @return \ReflectionMethod for the specified method
      */
     public function getProtectedMethod($name)
     {
@@ -613,4 +619,32 @@ public function testAddressTag()
         $this->assertRegExp('|contact persons for the <a href="Activity">W3C HTML Activity</a>|', $contents);
         $this->assertRegExp('|</address>|', $contents);
     }
+
+    /**
+     * Ensure direct DOM manipulation doesn't break TEXT_RAW elements (iframe, script, etc...)
+     */
+    public function testHandlingInvalidRawContent()
+    {
+        $dom = $this->html5->loadHTML(
+    '<!doctype html>
+<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);
+
+        $contents = $this->html5->saveHTML($dom);
+
+        $this->assertTrue(strpos($contents, '<script id="template" type="x-tmpl-mustache">
+           <h1>Hello!</h1>
+       <p>Bar</p></script>')!==false);
+    }
 }
