Skip to content

standard: Make strcoll() use PATH ZPP #20498

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −2
Open

standard: Make strcoll() use PATH ZPP #20498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ PHP NEWS
- Standard:
. Fixed bug GH-19926 (reset internal pointer earlier while splicing array
while COW violation flag is still set). (alexandre-daubois)
. strcoll() now throws a ValueError when passed a string containing NUL bytes
instead of silently cutting off the string after the first NUL byte.
(ndossche)

- Streams:
. Added so_reuseaddr streams context socket option that allows disabling
Expand Down
4 changes: 4 additions & 0 deletions UPGRADING
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ PHP 8.6 UPGRADE NOTES
. Invalid values now throw in Phar::mungServer() instead of being silently
ignored.

- Standard:
. strcoll() now throws a ValueError when passed a string containing NUL bytes
instead of silently cutting off the string after the first NUL byte.

========================================
2. New Features
========================================
Expand Down
4 changes: 2 additions & 2 deletions ext/standard/string.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,8 +458,8 @@ PHP_FUNCTION(strcoll)
zend_string *s1, *s2;

ZEND_PARSE_PARAMETERS_START(2, 2)
Z_PARAM_STR(s1)
Z_PARAM_STR(s2)
Z_PARAM_PATH_STR(s1)
Copy link
Member

@devnexen devnexen Nov 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we probably need 2 test cases at least.

Z_PARAM_PATH_STR(s2)
ZEND_PARSE_PARAMETERS_END();

RETURN_LONG(strcoll((const char *) ZSTR_VAL(s1),
Expand Down