summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-06-09 16:46:58 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-06-09 16:47:40 +0200
commit3b8d26accf1c0613614a2091314fd6af9fc9ac21 (patch)
treec52d3ddca5cc826512fafaa71661e8310f64ddab
parentbeddb97b4c5bcbe47166ea2e3229ca5498cf4c52 (diff)
downloadphp-git-3b8d26accf1c0613614a2091314fd6af9fc9ac21.tar.gz
Remove obsolete __lambda_func handling
This is a leftover from create_function() support.
-rw-r--r--ext/spl/php_spl.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index 2603de7cad..324dbe4b72 100644
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -739,9 +739,8 @@ PHP_FUNCTION(spl_autoload_functions)
fptr = spl_autoload_call_fn;
if (EG(autoload_func) == fptr) {
- zend_string *key;
array_init(return_value);
- ZEND_HASH_FOREACH_STR_KEY_PTR(SPL_G(autoload_functions), key, alfi) {
+ ZEND_HASH_FOREACH_PTR(SPL_G(autoload_functions), alfi) {
if (!Z_ISUNDEF(alfi->closure)) {
Z_ADDREF(alfi->closure);
add_next_index_zval(return_value, &alfi->closure);
@@ -758,11 +757,7 @@ PHP_FUNCTION(spl_autoload_functions)
add_next_index_str(&tmp, zend_string_copy(alfi->func_ptr->common.function_name));
add_next_index_zval(return_value, &tmp);
} else {
- if (strncmp(ZSTR_VAL(alfi->func_ptr->common.function_name), "__lambda_func", sizeof("__lambda_func") - 1)) {
- add_next_index_str(return_value, zend_string_copy(alfi->func_ptr->common.function_name));
- } else {
- add_next_index_str(return_value, zend_string_copy(key));
- }
+ add_next_index_str(return_value, zend_string_copy(alfi->func_ptr->common.function_name));
}
} ZEND_HASH_FOREACH_END();
return;