Commit e7e86ca4f00 for php
commit e7e86ca4f003a5f8b6c0d62340ed8e504f1b1421
Merge: 0adf274615c 26e5bc454c9
Author: Ilia Alshanetsky <ilia@ilia.ws>
Date: Sun Oct 11 08:14:51 2026 -0400
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
ext/pdo: Avoid a duplicate warning for a rejected statement class
diff --cc NEWS
index 291ab7db00f,aaed43baa2c..83c82205397
--- a/NEWS
+++ b/NEWS
@@@ -30,8 -34,13 +30,12 @@@ PH
. Fix type inference of ADD_ARRAY_UNPACK with integer keys. (ndossche)
. Fix too wide type inference for ASSIGN_DIM_OP. (ndossche)
. Fix OSS-Fuzz #568005340 (FETCH_DIM_FUNC_ARG partial conversion). (ndossche)
- . Fixed bug GH-24218 (Invalid opcode for count() of a literal array when
- SCCP is disabled). (Lazizbek Ergashev)
+ . Fix exception checks due to NAN warnings and object empty()'s. (ndossche)
+ - PDO:
+ . Fixed a duplicate warning when ATTR_STATEMENT_CLASS is rejected on a
+ persistent connection. (Ilia Alshanetsky)
+
- Phpdbg:
. Fix wrong command names. (ndossche, Weilin Du)