From 7b70ee5a9d055e4541b94bc08d89261fdf53d5c6 Mon Sep 17 00:00:00 2001 From: henderkes Date: Sat, 3 Jan 2026 23:06:39 +0100 Subject: [PATCH 1/2] Remove duplicate no/yes print for preserve_none Closes GH-20827 --- Zend/Zend.m4 | 1 - 1 file changed, 1 deletion(-) diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index 1e91450fcb947..0e45bdb8af90f 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -568,7 +568,6 @@ int main(void) { [php_cv_preserve_none=no], [php_cv_preserve_none=no]) ]) - AC_MSG_RESULT([$php_cv_preserve_none]) AS_VAR_IF([php_cv_preserve_none], [yes], [ AC_DEFINE([HAVE_PRESERVE_NONE], [1], [Define to 1 if you have preserve_none support.]) From cb63e4f998b9cd0136a9c9a0174c9552c1848665 Mon Sep 17 00:00:00 2001 From: Jordi Kroon Date: Sun, 4 Jan 2026 01:27:40 +0100 Subject: [PATCH 2/2] [skip ci] Remove obsolete comment (GH-20826) --- .../tests/pdo_fetch_class_change_ctor_args_during_fetch2.phpt | 1 - 1 file changed, 1 deletion(-) diff --git a/ext/pdo/tests/pdo_fetch_class_change_ctor_args_during_fetch2.phpt b/ext/pdo/tests/pdo_fetch_class_change_ctor_args_during_fetch2.phpt index 23b91210d9dab..819b452ad808f 100644 --- a/ext/pdo/tests/pdo_fetch_class_change_ctor_args_during_fetch2.phpt +++ b/ext/pdo/tests/pdo_fetch_class_change_ctor_args_during_fetch2.phpt @@ -27,7 +27,6 @@ class Test { } } -// TODO Rename pdo_fetch_class_change_ctor_two table to pdo_fetch_class_change_ctor_two in PHP-8.4 $db->exec('CREATE TABLE pdo_fetch_class_change_ctor_two(id int NOT NULL PRIMARY KEY, val1 VARCHAR(10), val2 VARCHAR(10))'); $db->exec("INSERT INTO pdo_fetch_class_change_ctor_two VALUES(1, 'A', 'alpha')"); $db->exec("INSERT INTO pdo_fetch_class_change_ctor_two VALUES(2, 'B', 'beta')");