Skip to content

[pull] master from php:master #816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Mar 26, 2026
Merged

[pull] master from php:master #816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e45c17
[ext/standard] Use hash add_new variant in array_count_values()
arshidkv12 Mar 26, 2026
4f02d15
ext/ldap: ldap_free_result() always returns true
Girgias Mar 26, 2026
a2c9606
ext/ldap: CS nit
Girgias Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ext/ldap/ldap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ext/ldap/ldap.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}

Expand Down
4 changes: 2 additions & 2 deletions ext/ldap/ldap_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ext/standard/array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4493,15 +4493,15 @@ 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)++;
}
} else if (Z_TYPE_P(entry) == IS_STRING) {
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)++;
}
Expand Down