Commit 5485f8ee401 for php.net
commit 5485f8ee401a7674174b6c353a90e39d3a945825
Merge: f134227e5d9 9ec303edde5
Author: Arnaud Le Blanc <arnaud.lb@gmail.com>
Date: Fri Mar 20 15:45:15 2026 +0100
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Fix GH-20875: Propagate IN_GET guard in get_property_ptr_ptr for lazy proxies
diff --cc NEWS
index bbf02459e01,a5605382424..273a2d496b0
--- a/NEWS
+++ b/NEWS
@@@ -1,14 -1,14 +1,16 @@@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 8.4.20
-
-- Bz2:
- . Fix truncation of total output size causing erroneous errors. (ndossche)
+?? ??? ????, PHP 8.5.5
- Core:
+ . Fixed bug GH-20672 (Incorrect property_info sizing for locally shadowed
+ trait properties). (ilutov)
+ . Fixed bugs GH-20875, GH-20873, GH-20854 (Propagate IN_GET guard in
+ get_property_ptr_ptr for lazy proxies). (iliaal)
+- Bz2:
+ . Fix truncation of total output size causing erroneous errors. (ndossche)
+
- GD:
. Fixed bug GH-21431 (phpinfo() to display libJPEG 10.0 support).
(David Carlier)