Fix tests for libxml2 2.14

nielsdos · nielsdos · commit f209eb448e76 · 2025-03-10T20:22:11.000+01:00
See GH-18009.
diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt
@@ -8,6 +8,10 @@ Antonio Diaz Ruiz <dejalatele@gmail.com>
 assert.bail=true
 --EXTENSIONS--
 dom
+--SKIPIF--
+<?php
+if (LIBXML_VERSION >= 21400) die("skip libxml >= 2.14 no longer has this non-standard warning");
+?>
 --FILE--
 <?php
 $doc = new DOMDocument();
diff --git a/ext/dom/tests/bug69679.phpt b/ext/dom/tests/bug69679.phpt
@@ -9,6 +9,6 @@ $html = "<!DOCTYPE html><html><head><meta charset='UTF-8'></head><body>U+0000 <s
 $doc->loadHTML($html);
 print($doc->saveHTML());
 ?>
---EXPECT--
+--EXPECTF--
 <!DOCTYPE html>
-<html><head><meta charset="UTF-8"></head><body>U+0000 <span></span></body></html>
+<html><head><meta charset="UTF-8"></head><body>U+0000 <span>%r(&#65533;|)%r</span></body></html>
diff --git a/ext/dom/tests/bug78025.phpt b/ext/dom/tests/bug78025.phpt
@@ -6,9 +6,8 @@ dom
 <?php
 $htm = "<!DOCTYPE><html></html>";
 $dom = new DOMDocument;
-$dom->loadHTML($htm);
+$dom->loadHTML($htm, LIBXML_NOERROR);
 var_dump($dom->doctype->name);
 ?>
 --EXPECTF--
-Warning: DOMDocument::loadHTML(): htmlParseDocTypeDecl : no DOCTYPE name ! in Entity, line: 1 in %s on line %d
 string(0) ""
diff --git a/ext/dom/tests/bug80268_2.phpt b/ext/dom/tests/bug80268_2.phpt
@@ -9,13 +9,13 @@ if (LIBXML_VERSION < 20912) die('skip For libxml2 >= 2.9.12 only');
 --FILE--
 <?php
 $doc = new DOMDocument;
-$doc->loadHTML("<p>foo\0bar</p>");
+$doc->loadHTML("<p>foo\0bar</p>", LIBXML_NOERROR);
 $html = $doc->saveHTML();
 var_dump(strpos($html, '<p>foo</p>') !== false);
 
 file_put_contents(__DIR__ . '/80268.html', "<p>foo\0bar</p>");
 $doc = new DOMDocument;
-$doc->loadHTMLFile(__DIR__ . '/80268.html');
+$doc->loadHTMLFile(__DIR__ . '/80268.html', LIBXML_NOERROR);
 $html = $doc->saveHTML();
 var_dump(strpos($html, '<p>foo</p>') !== false);
 ?>
@@ -24,8 +24,5 @@ var_dump(strpos($html, '<p>foo</p>') !== false);
 unlink(__DIR__ . '/80268.html');
 ?>
 --EXPECTF--
-Warning: DOMDocument::loadHTML(): Char 0x0 out of allowed range in Entity, line: 1 in %s on line %d
 bool(false)
-
-Warning: DOMDocument::loadHTMLFile(): Char 0x0 out of allowed range in %s on line %d
 bool(false)
diff --git a/ext/simplexml/tests/bug51615.phpt b/ext/simplexml/tests/bug51615.phpt
@@ -7,7 +7,7 @@ dom
 <?php
 
 $dom = new DOMDocument;
-$dom->loadHTML('<span title=""y">x</span><span title=""z">x</span>');
+$dom->loadHTML('<span title=""y">x</span><span title=""z">x</span>', LIBXML_NOERROR);
 $html = simplexml_import_dom($dom);
 
 var_dump($html->body->span);
@@ -18,15 +18,12 @@ foreach ($html->body->span as $obj) {
 
 ?>
 --EXPECTF--
-Warning: DOMDocument::loadHTML(): error parsing attribute name in Entity, line: 1 in %s on line %d
-
-Warning: DOMDocument::loadHTML(): error parsing attribute name in Entity, line: 1 in %s on line %d
 object(SimpleXMLElement)#%d (3) {
   ["@attributes"]=>
   array(2) {
     ["title"]=>
     string(0) ""
-    ["y"]=>
+    [%r("y"{1,2})%r]=>
     string(0) ""
   }
   [0]=>
