Skip to content

Commit 79427ae

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Update error message for libxml 2.13 Update libxml test for the directory field behaviour change
2 parents 3235817 + 3ec5919 commit 79427ae

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ext/libxml/tests/bug61367-read_2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ bool(true)
5858
int(4)
5959
bool(true)
6060

61-
Warning: DOMDocument::loadXML(): %Sfailed to load external entity "file:///%s/test_bug_61367-read/bad" in %s on line %d
61+
%s: DOMDocument::loadXML(): %Sfailed to load %s
6262

6363
Warning: Attempt to read property "nodeValue" on null in %s on line %d

ext/libxml/tests/libxml_disable_entity_loader_2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ bool(true)
3939
Deprecated: Function libxml_disable_entity_loader() is deprecated in %s on line %d
4040
bool(false)
4141

42-
Warning: DOMDocument::loadXML(): %Sfailed to load external entity "%s" in %s on line %d
42+
%s: DOMDocument::loadXML(): %Sfailed to load %s
4343
bool(true)
4444
Done

ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ string(13) "-//FOO/ENTITY"
6161
string(32) "http://example.com/fooentity.ent"
6262
array(4) {
6363
["directory"]=>
64-
string(%d) "%s"
64+
%r(NULL|string\(%d\) "%s")%r
6565
["intSubName"]=>
6666
string(3) "foo"
6767
["extSubURI"]=>

0 commit comments

Comments
 (0)