]> granicus.if.org Git - php/commitdiff
Remove obsolete __lambda_func handling
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 9 Jun 2020 14:46:58 +0000 (16:46 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 9 Jun 2020 14:47:40 +0000 (16:47 +0200)
This is a leftover from create_function() support.

ext/spl/php_spl.c

index 2603de7cad472d6330d3ae24813c3ae6a27f9dab..324dbe4b7213e729bb915cb0c61f41aab93f56e6 100644 (file)
@@ -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;