Fixed wrong HTML detection on PHP 8.4

stloyd · stloyd · commit c8ce9c1d03c0 · 2025-10-31T13:28:15.000+01:00
diff --git a/src/lib/types/src/Flow/Types/Type/Native/String/StringTypeChecker.php b/src/lib/types/src/Flow/Types/Type/Native/String/StringTypeChecker.php
@@ -119,15 +119,19 @@ public function isHTML() : bool
             return false;
         }
 
-        if (\class_exists('\Dom\HTMLDocument', false)) {
-            $options = \LIBXML_HTML_NOIMPLIED;
+        if (\preg_match('/(<!doctype(.+?)>)?<html(.+?)>(.+?)<\/html>/im', $this->string) === 1) {
+            if (\class_exists('\Dom\HTMLDocument', false)) {
+                $options = \LIBXML_HTML_NOIMPLIED;
 
-            if (defined('Dom\HTML_NO_DEFAULT_NS')) {
-                $options |= constant('\Dom\HTML_NO_DEFAULT_NS');
+                if (defined('Dom\HTML_NO_DEFAULT_NS')) {
+                    $options |= constant('\Dom\HTML_NO_DEFAULT_NS');
+                }
+
+                $doc = @HTMLDocument::createFromString($this->string, $options);
+
+                return $doc->saveHtml() === $this->string;
             }
 
-            HTMLDocument::createFromString($this->string, $options);
-        } elseif (\preg_match('/(<!doctype(.+?)>)?<html(.+?)>(.+?)<\/html>/im', $this->string) === 1) {
             try {
                 \libxml_use_internal_errors(true);
 
diff --git a/src/lib/types/tests/Flow/Types/Tests/Unit/Value/HTMLDocumentTest.php b/src/lib/types/tests/Flow/Types/Tests/Unit/Value/HTMLDocumentTest.php
@@ -14,11 +14,11 @@ final class HTMLDocumentTest extends TestCase
     #[RequiresPhp('>= 8.4')]
     public function test_create_with_dom_document_html_on_newer() : void
     {
-        $doc = \Dom\HTMLDocument::createFromString('<html><body><div><span>bar</span></div></body></html>');
+        $doc = \Dom\HTMLDocument::createFromString('<html><body><div><span>bar</span></div></body></html>', \LIBXML_HTML_NOIMPLIED);
 
         $document = new HTMLDocument($doc);
 
-        self::assertSame('<html><head></head><body><div><span>bar</span></div></body></html>', (string) $document);
+        self::assertSame('<html><body><div><span>bar</span></div></body></html>', (string) $document);
     }
 
     #[RequiresPhp('<= 8.4')]

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@ final class HTMLDocumentTest extends TestCase`
`14`	`14`	`#[RequiresPhp('>= 8.4')]`
`15`	`15`	`public function test_create_with_dom_document_html_on_newer() : void`
`16`	`16`	`{`
`17`		`- $doc = \Dom\HTMLDocument::createFromString('<html><body><div><span>bar</span></div></body></html>');`
	`17`	`+ $doc = \Dom\HTMLDocument::createFromString('<html><body><div><span>bar</span></div></body></html>', \LIBXML_HTML_NOIMPLIED);`
`18`	`18`
`19`	`19`	`$document = new HTMLDocument($doc);`
`20`	`20`
`21`		`- self::assertSame('<html><head></head><body><div><span>bar</span></div></body></html>', (string) $document);`
	`21`	`+ self::assertSame('<html><body><div><span>bar</span></div></body></html>', (string) $document);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`#[RequiresPhp('<= 8.4')]`