archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2' into PHP-8.3

Browse source 
* PHP-8.2:
  Update error message for libxml 2.13
  Update libxml test for the directory field behaviour change
This commit is contained in:
Niels Dossche 2024-09-12 23:07:12 +02:00
commit 79427ae08e
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/libxml/tests/bug61367-read_2.phpt
View file

@ -58,6 +58,6 @@ bool(true)
int(4) int(4)
bool(true) bool(true)
Warning: DOMDocument::loadXML(): %Sfailed to load external entity "file:///%s/test_bug_61367-read/bad" in %s on line %d %s: DOMDocument::loadXML(): %Sfailed to load %s
Warning: Attempt to read property "nodeValue" on null in %s on line %d Warning: Attempt to read property "nodeValue" on null in %s on line %d

2
ext/libxml/tests/libxml_disable_entity_loader_2.phpt
View file

@ -39,6 +39,6 @@ bool(true)
Deprecated: Function libxml_disable_entity_loader() is deprecated in %s on line %d Deprecated: Function libxml_disable_entity_loader() is deprecated in %s on line %d
bool(false) bool(false)
Warning: DOMDocument::loadXML(): %Sfailed to load external entity "%s" in %s on line %d %s: DOMDocument::loadXML(): %Sfailed to load %s
bool(true) bool(true)
Done Done

2
ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
View file

@ -61,7 +61,7 @@ string(13) "-//FOO/ENTITY"
string(32) "http://example.com/fooentity.ent" string(32) "http://example.com/fooentity.ent"
array(4) { array(4) {
["directory"]=> ["directory"]=>
string(%d) "%s" %r(NULL|string\(%d\) "%s")%r
["intSubName"]=> ["intSubName"]=>
string(3) "foo" string(3) "foo"
["extSubURI"]=> ["extSubURI"]=>