Commit 9aa4580e071 for php.net

commit 9aa4580e071c71e9d79be4d81914889dbbe04382
Merge: 6c1b05c4290 e44db0cdfd0
Author: Weilin Du <weilindu@php.net>
Date:   Mon Jun 29 22:49:50 2026 +0800

    Merge branch 'PHP-8.4' into PHP-8.5

    * PHP-8.4:

      ext/intl: Reset IntlChar error state on method entry (#22500)

diff --cc NEWS
index dc37bcf555d,57d91e34545..957e4123a22
--- a/NEWS
+++ b/NEWS
@@@ -24,8 -11,8 +24,10 @@@ PH
      fallback locale when a language tag cannot be canonicalized. (Weilin Du)
    . Fixed memory leaks when calling Collator::__construct() or
      Spoofchecker::__construct() twice. (Weilin Du)
 +  . Fixed memory leak when calling IntlListFormatter::__construct() twice.
 +    (Weilin Du)
+   . Fixed IntlChar methods leaving stale global error state after successful
+     calls. (Xuyang Zhang)

  - Phar:
    . Fixed inconsistent handling of the magic ".phar" directory. Paths such as