From 4cc261aa6afca2190b1b74de39c3caa462ec6f0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phan=20Kochen?= <git@stephank.nl>
Date: Sat, 22 May 2021 08:18:44 +0200
Subject: [PATCH] Fix tests failing as of libxml2 2.9.12

---
 ext/dom/tests/DOMDocument_loadXML_error1.phpt |  2 +-
 ext/dom/tests/DOMDocument_load_error1.phpt    |  2 +-
 ext/dom/tests/bug43364.phpt                   | 42 -------------------
 ext/dom/tests/bug80268.phpt                   | 24 -----------
 4 files changed, 2 insertions(+), 68 deletions(-)
 delete mode 100644 ext/dom/tests/bug43364.phpt
 delete mode 100644 ext/dom/tests/bug80268.phpt

diff --git a/ext/dom/tests/DOMDocument_loadXML_error1.phpt b/ext/dom/tests/DOMDocument_loadXML_error1.phpt
index 7ab878ae450c2..14d99e4ed9ad9 100644
--- a/ext/dom/tests/DOMDocument_loadXML_error1.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_error1.phpt
@@ -21,6 +21,6 @@ domdocumentloadxml_test_method.inc
 --EXPECTF--
 Warning: DOMDocument::load%r(XML){0,1}%r(): Opening and ending tag mismatch: title line 5 and book %s
 
-Warning: DOMDocument::load%r(XML){0,1}%r(): %rexpected '>'|Opening and ending tag mismatch: book line 5 and books%r %s
+Warning: DOMDocument::load%r(XML){0,1}%r(): %rexpected '>'|Opening and ending tag mismatch: book line (4|5) and books%r %s
 
 Warning: DOMDocument::load%r(XML){0,1}%r(): %rPremature end of data in tag books|EndTag: '<\/' not found in Entity, line: 13%r %s
diff --git a/ext/dom/tests/DOMDocument_load_error1.phpt b/ext/dom/tests/DOMDocument_load_error1.phpt
index ab1caccf73a8e..f736b0a0e81c6 100644
--- a/ext/dom/tests/DOMDocument_load_error1.phpt
+++ b/ext/dom/tests/DOMDocument_load_error1.phpt
@@ -21,6 +21,6 @@ domdocumentload_test_method.inc
 --EXPECTF--
 Warning: DOMDocument::load%r(XML){0,1}%r(): Opening and ending tag mismatch: title line 5 and book %s
 
-Warning: DOMDocument::load%r(XML){0,1}%r(): %rexpected '>'|Opening and ending tag mismatch: book line 5 and books%r %s
+Warning: DOMDocument::load%r(XML){0,1}%r(): %rexpected '>'|Opening and ending tag mismatch: book line (4|5) and books%r %s
 
 Warning: DOMDocument::load%r(XML){0,1}%r(): %rPremature end of data in tag books|EndTag: '<\/' not found%r %s
diff --git a/ext/dom/tests/bug43364.phpt b/ext/dom/tests/bug43364.phpt
deleted file mode 100644
index 68e030c20fc38..0000000000000
--- a/ext/dom/tests/bug43364.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-Bug #43364 (recursive xincludes don't remove internal xml nodes properly)
---EXTENSIONS--
-dom
---FILE--
-<?php
-function loopElements($nodes)
-{
-    $count = 0;
-    foreach($nodes as $node) {
-        if($node instanceof DOMElement) {
-            $count++;
-            if($node->childNodes->length > 0) {
-                $count += loopElements($node->childNodes);
-            }
-        }
-    }
-    return $count;
-}
-
-$xml = <<<DOC
-<?xml version="1.0" encoding="UTF-8"?>
-<root xmlns:xi="http://www.w3.org/2001/XInclude">
-    <a>
-        <a_child1>ac1</a_child1>
-        <a_child2>ac2</a_child2>
-    </a>
-    <b><xi:include xpointer="xpointer(/root/a)" /></b>
-    <c><xi:include xpointer="xpointer(/root/b)" /></c>
-</root>
-DOC;
-
-$doc = new DomDocument();
-$doc->loadXml($xml);
-$doc->xinclude();
-
-$count = loopElements(array($doc->documentElement));
-
-var_dump($count);
-?>
---EXPECT--
-int(13)
diff --git a/ext/dom/tests/bug80268.phpt b/ext/dom/tests/bug80268.phpt
deleted file mode 100644
index 313cf70a37e26..0000000000000
--- a/ext/dom/tests/bug80268.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-Bug #80268 (loadHTML() truncates at NUL bytes)
---EXTENSIONS--
-dom
---FILE--
-<?php
-$doc = new DOMDocument;
-$doc->loadHTML("<p>foo\0bar</p>");
-$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');
-$html = $doc->saveHTML();
-var_dump(strpos($html, '<p>foo</p>') !== false);
-?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/80268.html');
-?>
---EXPECT--
-bool(true)
-bool(true)