Commit 61299e081b7 for php

commit 61299e081b7e0edef543b904da886ecf8a77550b
Merge: 38b2036e6f7 e8dfd8e4dea
Author: Weilin Du <weilindu@php.net>
Date:   Sat Oct 3 00:13:51 2026 +0800

    Merge branch 'PHP-8.5' into PHP-8.6

    * PHP-8.5:
      ext/intl: Fix overlapping grapheme matches with negative search offsets (#24028)

diff --cc NEWS
index f9ce88ceec1,963326ae7ad..9eddfb8f9a1
--- a/NEWS
+++ b/NEWS
@@@ -49,7 -72,24 +49,9 @@@ PH
    . Fixed grapheme_strstr() and grapheme_strpos() missing canonically
      equivalent matches, and grapheme searches reporting ICU errors for empty
      haystacks. (Weilin Du)
+   . Fixed grapheme_strrpos() and grapheme_strripos() skipping overlapping matches
+     when using a negative offset. (Weilin Du)

 -- Lexbor:
 -  . Merge patches lexbor/lexbor@8a14bc0 and lexbor/lexbor@f67ce4b, fixing a
 -    heap buffer overflow in :lexbor-contains() parsing and buffer overflows
 -    in malformed decode replay. (alexandre-daubois)
 -
 -- MBString:
 -  . Fixed bug GH-23106 (mb_strpos() reads past the end of a haystack ending in
 -    a truncated UTF-8 sequence). (Lazizbek Ergashev)
 -  . Fixed mbstring functions emitting surrogates in UTF-8 output and flagging
 -    it as valid UTF-8. (Nicolas Grekas)
 -
 -- MySQLi:
 -  . Fix GH-22854: Fixed failed assertion when accessing mysqli property after
 -    failed reconnection. (Kamil Tekiela)
 -
  - MySQLnd:
    . Fixed field_count not resetting on OK packet. (Kamil Tekiela)
    . Fixed memory leak when closing a prepared statement after its connection