php
diff --git a/‎ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt
+4 b/‎ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt
+4
diff --git a/‎ext/dom/tests/bug69679.phpt
+2-2 b/‎ext/dom/tests/bug69679.phpt
+2-2
diff --git a/‎ext/dom/tests/bug78025.phpt
+1-2 b/‎ext/dom/tests/bug78025.phpt
+1-2
diff --git a/‎ext/dom/tests/bug80268_2.phpt
+2-5 b/‎ext/dom/tests/bug80268_2.phpt
+2-5
diff --git a/‎ext/dom/tests/gh16535.phpt
+1-1 b/‎ext/dom/tests/gh16535.phpt
+1-1
diff --git a/‎ext/simplexml/tests/bug51615.phpt
+2-5 b/‎ext/simplexml/tests/bug51615.phpt
+2-5
@@ -6,6 +6,10 @@ Verifies that an warning message is showed if an empty document is loaded
 Antonio Diaz Ruiz <[email protected]>
 --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();
 
@@ -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>
@@ -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) ""
@@ -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)
@@ -14,7 +14,7 @@ try {
 } catch (DOMException $e) {
     echo $e->getMessage(), "\n";
 }
-$v2->loadHTML("oU");
+$v2->loadHTML("<p>oU</p>");
 echo $v2->saveXML();
 
 ?>
 
@@ -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]=>
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ try {`
`14`	`14`	`} catch (DOMException $e) {`
`15`	`15`	`echo $e->getMessage(), "\n";`
`16`	`16`	`}`
`17`		`-$v2->loadHTML("oU");`
	`17`	`+$v2->loadHTML("<p>oU</p>");`
`18`	`18`	`echo $v2->saveXML();`
`19`	`19`
`20`	`20`	`?>`