[php-src] master: Merge branch 'PHP-8.4' into PHP-8.5

Author: Weilin Du (LamentXU123) Date: 2026-10-01T00:30:30+08:00 Commit: https://github.com/php/php-src/commit/4a73566163200743ff3e4fb7656e6baf8da5ef1f Raw diff: https://github.com/php/php-src/commit/4a73566163200743ff3e4fb7656e6baf8da5ef1f.diff Merge branch 'PHP-8.4' into PHP-8.5 * PHP-8.4: ext/intl: Fix grapheme_strstr() and grapheme_stristr() match offsets after supplementary characters (#24012) Changed paths: A ext/intl/tests/grapheme_strstr_supplementary_prefix.phpt M NEWS M ext/intl/grapheme/grapheme_util.c Diff: diff --git a/NEWS b/NEWS index 7042d24df1d0..8e820bc166b7 100644 --- a/NEWS +++ b/NEWS @@ -65,6 +65,8 @@ PHP NEWS unconstructed Collator. (Ilia Alshanetsky) . Fixed crash in intl_error_set_custom_msg() without an active call frame. (David Carlier) + . Fixed grapheme_strstr() and grapheme_stristr() returning incorrect substrings + when supplementary characters precede the match. (Weilin Du) - Lexbor: . Merge patches lexbor/lexbor@8a14bc0 and lexbor/lexbor@f67ce4b, fixing a diff --git a/ext/intl/grapheme/grapheme_util.c b/ext/intl/grapheme/grapheme_util.c index 6539f482ca61..72aa4bd67fac 100644 --- a/ext/intl/grapheme/grapheme_util.c +++ b/ext/intl/grapheme/grapheme_util.c @@ -190,7 +190,7 @@ int32_t grapheme_strpos_utf16(char *haystack, size_t haystack_len, char *needle, if(char_pos != USEARCH_DONE && ubrk_isBoundary(bi, char_pos)) { ret_pos = grapheme_count_graphemes(bi, uhaystack,char_pos); if(puchar_pos) { - *puchar_pos = char_pos; + *puchar_pos = u_countChar32(uhaystack, char_pos); } } else { ret_pos = -1; diff --git a/ext/intl/tests/grapheme_strstr_supplementary_prefix.phpt b/ext/intl/tests/grapheme_strstr_supplementary_prefix.phpt new file mode 100644 index 000000000000..f9f85880604a --- /dev/null +++ b/ext/intl/tests/grapheme_strstr_supplementary_prefix.phpt @@ -0,0 +1,27 @@ +--TEST-- +grapheme_strstr() and grapheme_stristr() preserve match boundaries after supplementary characters +--EXTENSIONS-- +intl +--FILE-- +<?php +foreach (["\u{1F600}", "\u{1F600}\u{1F600}", "\u{1F600}e\u{0301}"] as $prefix) { + $haystack = $prefix . 'abc'; + var_dump(grapheme_strstr($haystack, 'a')); + var_dump(grapheme_strstr($haystack, 'a', true)); + var_dump(grapheme_stristr($haystack, 'A')); + var_dump(grapheme_stristr($haystack, 'A', true)); +} +?> +--EXPECT-- +string(3) "abc" +string(4) "😀" +string(3) "abc" +string(4) "😀" +string(3) "abc" +string(8) "😀😀" +string(3) "abc" +string(8) "😀😀" +string(3) "abc" +string(7) "😀é" +string(3) "abc" +string(7) "😀é"