Skip to content

Commit d34d015

Browse files
committed
ext/ldap: Promote warning to ValueError if array is not a dict
1 parent 127968b commit d34d015

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

ext/ldap/ldap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2235,7 +2235,7 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, int ext)
22352235
unsigned int attribute_index = 0;
22362236
ZEND_HASH_FOREACH_STR_KEY_VAL(attributes_ht, attribute, attribute_values) {
22372237
if (attribute == NULL) {
2238-
php_error_docref(NULL, E_WARNING, "Unknown attribute in the data");
2238+
zend_argument_value_error(3, "must be an associative array of attribute => values");
22392239
RETVAL_FALSE;
22402240
goto cleanup;
22412241
}

ext/ldap/tests/gh16136.phpt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,5 @@ try {
2525
}
2626

2727
?>
28-
--EXPECTF--
29-
Warning: ldap_add(): Unknown attribute in the data in %s on line %d
30-
bool(false)
28+
--EXPECT--
29+
ValueError: ldap_add(): Argument #3 ($entry) must be an associative array of attribute => values

ext/ldap/tests/ldap_add_modify_delete_programming_errors.phpt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,7 @@ try {
133133
?>
134134
--EXPECTF--
135135
ValueError: ldap_add(): Argument #3 ($entry) must not be empty
136-
137-
Warning: ldap_add(): Unknown attribute in the data in %s on line %d
138-
bool(false)
136+
ValueError: ldap_add(): Argument #3 ($entry) must be an associative array of attribute => values
139137

140138
Warning: ldap_add(): Add: Can't contact LDAP server in %s on line %d
141139
bool(false)

0 commit comments

Comments
 (0)