split test

goetas · goetas · commit 585278e14a10 · 2023-01-11T21:09:19.000+01:00
diff --git a/src/HTML5/Parser/DOMTreeBuilder.php b/src/HTML5/Parser/DOMTreeBuilder.php
@@ -567,7 +567,7 @@ public function text($data)
             // Per '8.2.5.4.3 The "before head" insertion mode' the characters
             // " \t\n\r\f" should be ignored .
             $dataTmp = trim($data, " \t\n\r\f");
-            if (! empty($dataTmp)) {
+            if (!empty($dataTmp)) {
                 $this->startTag('head');
                 $this->endTag('head');
                 $this->startTag('body');
diff --git a/test/HTML5/Html5Test.php b/test/HTML5/Html5Test.php
@@ -507,7 +507,7 @@ public function testTagOmission($input, $expected)
 
         $out = $this->html5->saveHTML($doc);
 
-        $this->assertRegExp("|" . preg_quote($expected, "|") . "|", $out);
+        $this->assertRegExp('|' . preg_quote($expected, '|') . '|', $out);
     }
 
     /**
@@ -534,7 +534,7 @@ public function tagOmissionProvider()
                 '<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head>
 <body>
 <br>
-</body>'
+</body>',
             ),
         );
     }
diff --git a/test/HTML5/Parser/DOMTreeBuilderTest.php b/test/HTML5/Parser/DOMTreeBuilderTest.php
@@ -457,14 +457,17 @@ public function testText()
         $data = $wrapper->childNodes->item(0);
         $this->assertEquals(XML_TEXT_NODE, $data->nodeType);
         $this->assertEquals('test', $data->data);
+    }
 
+    public function testTextBeforeHeadNotAllowed()
+    {
         // The DomTreeBuilder has special handling for text when in before head mode.
-        $html = '<!DOCTYPE html><html>
-    Foo<head></head><body></body></html>';
+        $html = '<!DOCTYPE html><html>Foo<head></head><body></body></html>';
         $doc = $this->parse($html);
-        $this->assertEquals('Line 0, Col 0: Unexpected text. Ignoring: Foo', $this->errors[0]);
+        $this->assertEquals('Line 0, Col 0: Unexpected head tag outside of head context.', $this->errors[0]);
         $headElement = $doc->documentElement->firstChild;
         $this->assertEquals('head', $headElement->tagName);
+        $this->assertXmlStringEqualsXmlString($doc, '<html xmlns="http://www.w3.org/1999/xhtml"><head/><body>Foo<head/><body/></body></html>');
     }
 
     public function testParseErrors()

Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,7 @@ public function testTagOmission($input, $expected)`
`507`	`507`
`508`	`508`	`$out = $this->html5->saveHTML($doc);`
`509`	`509`
`510`		`- $this->assertRegExp("\|" . preg_quote($expected, "\|") . "\|", $out);`
	`510`	`+ $this->assertRegExp('\|' . preg_quote($expected, '\|') . '\|', $out);`
`511`	`511`	`}`
`512`	`512`
`513`	`513`	`/**`
`@@ -534,7 +534,7 @@ public function tagOmissionProvider()`
`534`	`534`	`'<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head>`
`535`	`535`	`<body>`
`536`	`536`	`<br>`
`537`		`-</body>'`
	`537`	`+</body>',`
`538`	`538`	`),`
`539`	`539`	`);`
`540`	`540`	`}`