summaryrefslogtreecommitdiff
path: root/ext/standard/array.c
diff options
context:
space:
mode:
authorLevi Morrison <levim@php.net>2015-01-05 17:27:25 -0700
committerLevi Morrison <levim@php.net>2015-01-05 17:27:25 -0700
commitbb7ceb046eb5f0d5fa25066a3d7f9b4eb8cc3c93 (patch)
tree3dcc6aa57716cba270c1f5f55b9c217457ba9be0 /ext/standard/array.c
parenta26ecbd5729d6a91d6ae54446c9ecf3392dffef8 (diff)
downloadphp-git-bb7ceb046eb5f0d5fa25066a3d7f9b4eb8cc3c93.tar.gz
Fix bug #55416
Remove extra, unnecessary warning when the callback fails for array_map, array_reduce and array_filter
Diffstat (limited to 'ext/standard/array.c')
-rw-r--r--ext/standard/array.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 86707f4842..05098f52ad 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -4537,7 +4537,6 @@ PHP_FUNCTION(array_reduce)
} else {
zval_ptr_dtor(&args[1]);
zval_ptr_dtor(&args[0]);
- php_error_docref(NULL, E_WARNING, "An error occurred while invoking the reduction callback");
return;
}
} ZEND_HASH_FOREACH_END();
@@ -4621,7 +4620,6 @@ PHP_FUNCTION(array_filter)
if (use_type == ARRAY_FILTER_USE_BOTH) {
zval_ptr_dtor(&args[1]);
}
- php_error_docref(NULL, E_WARNING, "An error occurred while invoking the filter callback");
return;
}
} else if (!zend_is_true(operand)) {
@@ -4691,7 +4689,6 @@ PHP_FUNCTION(array_map)
ZVAL_COPY(&arg, zv);
if (zend_call_function(&fci, &fci_cache) != SUCCESS || Z_TYPE(result) == IS_UNDEF) {
- php_error_docref(NULL, E_WARNING, "An error occurred while invoking the map callback");
zval_dtor(return_value);
zval_ptr_dtor(&arg);
RETURN_NULL();
@@ -4779,7 +4776,6 @@ PHP_FUNCTION(array_map)
fci.no_separation = 0;
if (zend_call_function(&fci, &fci_cache) != SUCCESS || Z_TYPE(result) == IS_UNDEF) {
- php_error_docref(NULL, E_WARNING, "An error occurred while invoking the map callback");
efree(array_pos);
zval_dtor(return_value);
for (i = 0; i < n_arrays; i++) {