Commit 4a735661632 for php
commit 4a73566163200743ff3e4fb7656e6baf8da5ef1f
Merge: 3093b9dacaf f2a59c14b95
Author: Weilin Du <weilindu@php.net>
Date: Thu Oct 1 00:30:30 2026 +0800
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)
diff --cc NEWS
index 7042d24df1d,4b9cd689113..8e820bc166b
--- a/NEWS
+++ b/NEWS
@@@ -59,12 -63,10 +59,14 @@@ PH
. Fixed cloning IntlDateFormatter and MessageFormatter losing PHP-side state
such as dateType, timeType, calendar and the message pattern.
(Ilia Alshanetsky)
+ . Fixed a crash when converting with a cloned UConverter that uses
+ toUCallback/fromUCallback. (Ilia Alshanetsky)
. Fixed Collator attribute and strength methods not rejecting an
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