summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2019-10-31 16:08:38 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2019-10-31 16:08:38 +0100
commite175a0a1c839e41218f7075082a73c4c13f84d57 (patch)
tree13543daf9248a3a8dd0453fed88c278f1ab595ce
parentd3237b550484780ae4e63b9e6c0e4ef94313209a (diff)
parente29922f054639a934f3077190729007896ae244c (diff)
downloadphp-git-e175a0a1c839e41218f7075082a73c4c13f84d57.tar.gz
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: Fix test cases for libxml2 2.9.10
-rw-r--r--ext/dom/tests/DOMDocument_loadXML_error1.phpt4
-rw-r--r--ext/dom/tests/DOMDocument_load_error1.phpt4
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/dom/tests/DOMDocument_loadXML_error1.phpt b/ext/dom/tests/DOMDocument_loadXML_error1.phpt
index 9a433d1282..41dd169506 100644
--- a/ext/dom/tests/DOMDocument_loadXML_error1.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_error1.phpt
@@ -21,6 +21,6 @@ domdocumentloadxml_test_method.php
--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(): expected '>' %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(): Premature end of data in tag books %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 4c661f7e69..a517af120a 100644
--- a/ext/dom/tests/DOMDocument_load_error1.phpt
+++ b/ext/dom/tests/DOMDocument_load_error1.phpt
@@ -21,6 +21,6 @@ domdocumentload_test_method.php
--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(): expected '>' %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(): Premature end of data in tag books %s
+Warning: DOMDocument::load%r(XML){0,1}%r(): %rPremature end of data in tag books|EndTag: '<\/' not found%r %s