Skip to content

Commit c434e04

Browse files
authored
Remove LIBXML_XINCLUDE option from valid list of XMLDocument (php#20907)
This option is only valid for pull parsers.
1 parent 9b0643e commit c434e04

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ PHP NEWS
99
needing to be present beforehand. (ndossche)
1010
. Added `clamp()`. (kylekatarnls, thinkverse)
1111

12+
- DOM:
13+
. Removed LIBXML_XINCLUDE from valid options for XMLDocument,
14+
as it was a no-op. (ndossche)
15+
1216
- Fileinfo:
1317
. Fixed bug GH-20679 (finfo_file() doesn't work on remote resources).
1418
(ndossche)

ext/dom/tests/modern/xml/XMLDocument_fromString_03.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dom
66
<?php
77

88
$flags = [
9-
LIBXML_RECOVER, LIBXML_NOENT, LIBXML_DTDLOAD, LIBXML_DTDATTR, LIBXML_DTDVALID, LIBXML_NOERROR, LIBXML_NOWARNING, LIBXML_NOBLANKS, LIBXML_XINCLUDE, LIBXML_NSCLEAN, LIBXML_NOCDATA, LIBXML_NONET, LIBXML_PEDANTIC, LIBXML_COMPACT, LIBXML_PARSEHUGE, LIBXML_BIGLINES
9+
LIBXML_RECOVER, LIBXML_NOENT, LIBXML_DTDLOAD, LIBXML_DTDATTR, LIBXML_DTDVALID, LIBXML_NOERROR, LIBXML_NOWARNING, LIBXML_NOBLANKS, LIBXML_NSCLEAN, LIBXML_NOCDATA, LIBXML_NONET, LIBXML_PEDANTIC, LIBXML_COMPACT, LIBXML_PARSEHUGE, LIBXML_BIGLINES
1010
];
1111

1212
try {
@@ -37,4 +37,3 @@ bool(true)
3737
bool(true)
3838
bool(true)
3939
bool(true)
40-
bool(true)

ext/dom/xml_document.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ static bool check_options_validity(uint32_t arg_num, zend_long options)
3939
| XML_PARSE_NOERROR
4040
| XML_PARSE_NOWARNING
4141
| XML_PARSE_NOBLANKS
42-
| XML_PARSE_XINCLUDE
4342
| XML_PARSE_NSCLEAN
4443
| XML_PARSE_NOCDATA
4544
| XML_PARSE_NONET
@@ -60,7 +59,6 @@ static bool check_options_validity(uint32_t arg_num, zend_long options)
6059
"LIBXML_NOERROR, "
6160
"LIBXML_NOWARNING, "
6261
"LIBXML_NOBLANKS, "
63-
"LIBXML_XINCLUDE, "
6462
"LIBXML_NSCLEAN, "
6563
"LIBXML_NOCDATA, "
6664
"LIBXML_NONET, "

0 commit comments

Comments
 (0)