Skip to content

ext/intl: Fix grapheme_strstr() and grapheme_stristr() match offsets … #24012

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
LamentXU123 merged 2 commits into from
Sep 30, 2026
+30 −1
Merged

ext/intl: Fix grapheme_strstr() and grapheme_stristr() match offsets … #24012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c51611a
ext/intl: Fix grapheme_strstr() and grapheme_stristr() match offsets …
LamentXU123 Sep 30, 2026
9423198
[skip ci] NEWS
LamentXU123 Sep 30, 2026
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: 2 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ PHP NEWS
(Ilia Alshanetsky)
. Fixed Collator attribute and strength methods not rejecting an
unconstructed Collator. (Ilia Alshanetsky)
. 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
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/grapheme/grapheme_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
27 changes: 27 additions & 0 deletions ext/intl/tests/grapheme_strstr_supplementary_prefix.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) "😀é"
Loading