Skip to content

Commit 9596ab1

Browse files
committed
Merge branch 'PHP-8.5'
* PHP-8.5: Fix phpGH-22138: skip libxml/xmlreader tests on non-ASCII paths.
2 parents a7aacec + c956d6d commit 9596ab1

4 files changed

Lines changed: 12 additions & 2 deletions

File tree

ext/libxml/tests/bug61367-read_2.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ dom
55
--SKIPIF--
66
<?php
77
if (LIBXML_VERSION < 20912) die('skip For libxml2 >= 2.9.12 only');
8+
if (preg_match('/[^\x00-\x7F]/', __DIR__)) die('skip path contains non-ASCII characters that libxml URI parser rejects');
89
?>
910
--INI--
1011
open_basedir=.
@@ -58,6 +59,6 @@ bool(true)
5859
int(4)
5960
bool(true)
6061

61-
%s: DOMDocument::loadXML(): %Sfailed to load %s
62+
%s: DOMDocument::loadXML(): %s
6263

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

ext/libxml/tests/libxml_disable_entity_loader_2.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ dom
66
--SKIPIF--
77
<?php
88
if (LIBXML_VERSION < 20912) die('skip For libxml2 >= 2.9.12 only');
9+
if (preg_match('/[^\x00-\x7F]/', __DIR__)) die('skip path contains non-ASCII characters that libxml URI parser rejects');
910
?>
1011
--FILE--
1112
<?php
@@ -40,6 +41,6 @@ bool(true)
4041
Deprecated: Function libxml_disable_entity_loader() is deprecated since 8.0, as external entity loading is disabled by default in %s on line %d
4142
bool(false)
4243

43-
%s: DOMDocument::loadXML(): %Sfailed to load %s
44+
%s: DOMDocument::loadXML(): %s
4445
bool(true)
4546
Done

ext/libxml/tests/libxml_entity_loading_disabled_by_default.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ libxml
55
dom
66
xml
77
simplexml
8+
--SKIPIF--
9+
<?php
10+
if (preg_match('/[^\x00-\x7F]/', __DIR__)) die('skip path contains non-ASCII characters that libxml URI parser rejects');
11+
?>
812
--FILE--
913
<?php
1014

ext/xmlreader/tests/012.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
XMLReader: accessing empty and non existing attributes
33
--EXTENSIONS--
44
xmlreader
5+
--SKIPIF--
6+
<?php
7+
if (preg_match('/[^\x00-\x7F]/', __DIR__)) die('skip path contains non-ASCII characters that libxml URI parser rejects');
8+
?>
59
--FILE--
610
<?php
711

0 commit comments

Comments
 (0)