Skip to content

[pull] master from php:master #1107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 11, 2025
Merged

[pull] master from php:master #1107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
890021e
SimpleXML: Use RETURN_STRINGL_FAST() for key() (#20127)
nielsdos Oct 11, 2025
a572b10
xml: Switch to safe option setting API (#20128)
nielsdos Oct 11, 2025
c3b66cd
[ci skip] Fix test formatting
nielsdos Oct 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/intl/tests/formatter/currencies.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--TEST--
NumberFormatter: currency formatting
----DESCRIPTION--
--DESCRIPTION--
Tests NumberFormatter with various currenct-related formatters.
--EXTENSIONS--
intl
Expand Down
2 changes: 1 addition & 1 deletion ext/simplexml/simplexml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2028,7 +2028,7 @@ PHP_METHOD(SimpleXMLElement, key)
}

curnode = intern->node->node;
RETURN_STRINGL((char*)curnode->name, xmlStrlen(curnode->name));
RETURN_STRINGL_FAST((char*)curnode->name, xmlStrlen(curnode->name));
}
/* }}} */

Expand Down
4 changes: 4 additions & 0 deletions ext/xml/compat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,8 +452,12 @@ XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *m
return NULL;
}

#if LIBXML_VERSION >= 21300
xmlCtxtSetOptions(parser->parser, XML_PARSE_OLDSAX | XML_PARSE_NOENT);
#else
php_libxml_sanitize_parse_ctxt_options(parser->parser);
xmlCtxtUseOptions(parser->parser, XML_PARSE_OLDSAX | XML_PARSE_NOENT);
#endif

parser->parser->wellFormed = 0;
if (sep != NULL) {
Expand Down