Skip to content

Commit db14b78

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix test cases for libxml2 2.9.10
2 parents edccf32 + e175a0a commit db14b78

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ext/dom/tests/DOMDocument_loadXML_error1.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ domdocumentloadxml_test_method.inc
2121
--EXPECTF--
2222
Warning: DOMDocument::load%r(XML){0,1}%r(): Opening and ending tag mismatch: title line 5 and book %s
2323

24-
Warning: DOMDocument::load%r(XML){0,1}%r(): expected '>' %s
24+
Warning: DOMDocument::load%r(XML){0,1}%r(): %rexpected '>'|Opening and ending tag mismatch: book line 5 and books%r %s
2525

26-
Warning: DOMDocument::load%r(XML){0,1}%r(): Premature end of data in tag books %s
26+
Warning: DOMDocument::load%r(XML){0,1}%r(): %rPremature end of data in tag books|EndTag: '<\/' not found in Entity, line: 13%r %s

ext/dom/tests/DOMDocument_load_error1.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ domdocumentload_test_method.inc
2121
--EXPECTF--
2222
Warning: DOMDocument::load%r(XML){0,1}%r(): Opening and ending tag mismatch: title line 5 and book %s
2323

24-
Warning: DOMDocument::load%r(XML){0,1}%r(): expected '>' %s
24+
Warning: DOMDocument::load%r(XML){0,1}%r(): %rexpected '>'|Opening and ending tag mismatch: book line 5 and books%r %s
2525

26-
Warning: DOMDocument::load%r(XML){0,1}%r(): Premature end of data in tag books %s
26+
Warning: DOMDocument::load%r(XML){0,1}%r(): %rPremature end of data in tag books|EndTag: '<\/' not found%r %s

0 commit comments

Comments
 (0)