Skip to content

Commit a7a318d

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
2 parents 24cd183 + cedee44 commit a7a318d

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

ext/standard/array.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6209,7 +6209,7 @@ PHP_FUNCTION(array_map)
62096209

62106210
for (i = 0; i < n_arrays; i++) {
62116211
if (Z_TYPE(arrays[i]) != IS_ARRAY) {
6212-
php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 2, zend_zval_type_name(&arrays[0]));
6212+
php_error_docref(NULL, E_WARNING, "Expected parameter %d to be an array, %s given", i + 2, zend_zval_type_name(&arrays[i]));
62136213
efree(array_pos);
62146214
return;
62156215
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
--TEST--
2+
Bug #77931: Warning for array_map mentions wrong type
3+
--FILE--
4+
<?php
5+
6+
array_map('trim', array(), 1);
7+
array_map('trim', array(), array(), true);
8+
array_map('trim', array(), array(), array(), null);
9+
10+
?>
11+
--EXPECTF--
12+
Warning: array_map(): Expected parameter 3 to be an array, int given in %s on line %d
13+
14+
Warning: array_map(): Expected parameter 4 to be an array, bool given in %s on line %d
15+
16+
Warning: array_map(): Expected parameter 5 to be an array, null given in %s on line %d

0 commit comments

Comments
 (0)