Commit 05922b75e75 for php.net
commit 05922b75e75e72b01a1d5dd18644fdc80ef59e11
Merge: 8e221404be0 b74bc273c4f
Author: Weilin Du <weilindu@php.net>
Date: Tue Aug 18 22:40:05 2026 +0800
Merge branch 'PHP-8.5'
* PHP-8.5:
Merge branch 'PHP-8.4' into PHP-8.5
diff --cc NEWS
index 9690787e59b,63ec75891ce..26d5db72e18
--- a/NEWS
+++ b/NEWS
@@@ -36,14 -17,15 +36,16 @@@ PH
the ICU constructor adopts the TimeZone. (iliaal)
. Fixed bug GH-23094 (NumberFormatter parsing offsets use UTF-16 positions
for UTF-8 strings). (ColumbusLabs)
+ . Fixed Locale::parseLocale() reading past a trailing '-' or '_'.
+ (iliaal, Xuyang Zhang)
-- Opcache:
- . Fixed opcache.protect_memory race under ZTS. (realFlowControl)
+- Phar:
+ . Fixed Phar archives being automatically detected when ".phar" only occurs
+ in a directory name or is not a filename extension in an included file's
+ path. (Weilin Du)
- Readline:
- . Fixed the interactive shell not waiting for the pager process to exit.
- (Weilin Du)
+ . Fixed class constant completion in the interactive shell. (Weilin Du)
- Zip:
. Fixed bug GH-17787 (ZipArchive stream stops reading early when the archive