Commit a2ac800

committed

Merge branch 'PHP-8.4'

* PHP-8.4: Fix GH-18015: Error messages for ldap_mod_replace are confusing

2 parents 6b6fde9 + 6717947 commit a2ac800Copy full SHA for a2ac800

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2316,12 +2316,12 @@ static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper, int ext)`
`2316`	`2316`	`SEPARATE_ARRAY(attribute_values);`
`2317`	`2317`	`uint32_t num_values = zend_hash_num_elements(Z_ARRVAL_P(attribute_values));`
`2318`	`2318`	`if (num_values == 0) {`
`2319`		`- zend_argument_value_error(3, "list of attribute values must not be empty");`
	`2319`	`+ zend_argument_value_error(3, "attribute \"%s\" must be a non-empty list of attribute values", ZSTR_VAL(attribute));`
`2320`	`2320`	`RETVAL_FALSE;`
`2321`	`2321`	`goto cleanup;`
`2322`	`2322`	`}`
`2323`	`2323`	`if (!php_ldap_is_numerically_indexed_array(Z_ARRVAL_P(attribute_values))) {`
`2324`		`- zend_argument_value_error(3, "must be an array of attribute values with numeric keys");`
	`2324`	`+ zend_argument_value_error(3, "attribute \"%s\" must be an array of attribute values with numeric keys", ZSTR_VAL(attribute));`
`2325`	`2325`	`RETVAL_FALSE;`
`2326`	`2326`	`goto cleanup;`
`2327`	`2327`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ ValueError: ldap_add(): Argument #3 ($entry) must be an associative array of att`
`137`	`137`	`ValueError: ldap_add(): Argument #3 ($entry) key must not be empty`
`138`	`138`	`ValueError: ldap_add(): Argument #3 ($entry) key must not contain any null bytes`
`139`	`139`	`Error: Object of class stdClass could not be converted to string`
`140`		`-ValueError: ldap_add(): Argument #3 ($entry) list of attribute values must not be empty`
`141`		`-ValueError: ldap_add(): Argument #3 ($entry) must be an array of attribute values with numeric keys`
	`140`	`+ValueError: ldap_add(): Argument #3 ($entry) attribute "attribute2" must be a non-empty list of attribute values`
	`141`	`+ValueError: ldap_add(): Argument #3 ($entry) attribute "attribute2" must be an array of attribute values with numeric keys`
`142`	`142`	`TypeError: LDAP value must be of type string\|int\|bool, array given`
`143`	`143`	`Error: Object of class stdClass could not be converted to string`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,6 @@ try {`
`76`	`76`	`?>`
`77`	`77`	`--EXPECT--`
`78`	`78`	`Error: Object of class stdClass could not be converted to string`
`79`		`-ValueError: ldap_add(): Argument #3 ($entry) list of attribute values must not be empty`
	`79`	`+ValueError: ldap_add(): Argument #3 ($entry) attribute "attribute2" must be a non-empty list of attribute values`
`80`	`80`	`TypeError: LDAP value must be of type string\|int\|bool, array given`
`81`	`81`	`TypeError: LDAP value must be of type string\|int\|bool, stdClass given`

Comments

(0)