From 5e45c17d817df003cd24109f0ae222c5d82fecd1 Mon Sep 17 00:00:00 2001 From: Arshid Date: Thu, 26 Mar 2026 20:22:31 +0530 Subject: [PATCH 1/3] [ext/standard] Use hash add_new variant in array_count_values() --- ext/standard/array.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/standard/array.c b/ext/standard/array.c index 87118cbd0ff24..f391829c676ab 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -4493,7 +4493,7 @@ PHP_FUNCTION(array_count_values) if ((tmp = zend_hash_index_find(Z_ARRVAL_P(return_value), Z_LVAL_P(entry))) == NULL) { zval data; ZVAL_LONG(&data, 1); - zend_hash_index_update(Z_ARRVAL_P(return_value), Z_LVAL_P(entry), &data); + zend_hash_index_add_new(Z_ARRVAL_P(return_value), Z_LVAL_P(entry), &data); } else { Z_LVAL_P(tmp)++; } @@ -4501,7 +4501,7 @@ PHP_FUNCTION(array_count_values) if ((tmp = zend_symtable_find(Z_ARRVAL_P(return_value), Z_STR_P(entry))) == NULL) { zval data; ZVAL_LONG(&data, 1); - zend_symtable_update(Z_ARRVAL_P(return_value), Z_STR_P(entry), &data); + zend_symtable_add_new(Z_ARRVAL_P(return_value), Z_STR_P(entry), &data); } else { Z_LVAL_P(tmp)++; } From 4f02d15b3639f23b0d4a85b3f3570a429b791fa7 Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Thu, 26 Mar 2026 19:47:21 +0000 Subject: [PATCH 2/3] ext/ldap: ldap_free_result() always returns true --- ext/ldap/ldap.stub.php | 2 +- ext/ldap/ldap_arginfo.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php index 84befe3f43f8e..52cf3828dba3d 100644 --- a/ext/ldap/ldap.stub.php +++ b/ext/ldap/ldap.stub.php @@ -659,7 +659,7 @@ function ldap_list($ldap, array|string $base, array|string $filter, array $attri /** @param LDAP\Connection|array $ldap */ function ldap_search($ldap, array|string $base, array|string $filter, array $attributes = [], int $attributes_only = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, ?array $controls = null): LDAP\Result|array|false {} - function ldap_free_result(LDAP\Result $result): bool {} + function ldap_free_result(LDAP\Result $result): true {} function ldap_count_entries(LDAP\Connection $ldap, LDAP\Result $result): int {} diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h index aa371b7a8d49c..8f5e7e34ba327 100644 --- a/ext/ldap/ldap_arginfo.h +++ b/ext/ldap/ldap_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit ldap.stub.php instead. - * Stub hash: 9e47a0d85336f0e149abbdf56468513c5d31780f */ + * Stub hash: 0dde8fd813f43640dee842c03365d7431858a56d */ #if defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ldap_connect, 0, 0, LDAP\\Connection, MAY_BE_FALSE) @@ -75,7 +75,7 @@ ZEND_END_ARG_INFO() #define arginfo_ldap_search arginfo_ldap_read -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_free_result, 0, 1, _IS_BOOL, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_free_result, 0, 1, IS_TRUE, 0) ZEND_ARG_OBJ_INFO(0, result, LDAP\\Result, 0) ZEND_END_ARG_INFO() From a2c9606ecd4e90f7628b61bd8843ed0851957dc9 Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Thu, 26 Mar 2026 19:47:28 +0000 Subject: [PATCH 3/3] ext/ldap: CS nit --- ext/ldap/ldap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 5cc462d624ac5..a13b25e1efdec 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -2434,7 +2434,9 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, bool ext) object_init_ex(return_value, ldap_result_ce); result = Z_LDAP_RESULT_P(return_value); result->result = ldap_res; - } else RETVAL_TRUE; + } else { + RETVAL_TRUE; + } } cleanup: