Revert for now

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index fa1a9a116697eee92ab6aa9d5d56159324941d3d..1eef4d9599157e78a6413b8d19cc15660a80da73 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -143,22 +143,6 @@ static
                ZEND_ARG_PASS_INFO(1)
        ZEND_END_ARG_INFO()
 
-static
-       ZEND_BEGIN_ARG_INFO(all_args_auto_ref, 0)
-               ZEND_ARG_PASS_INFO(4)
-       ZEND_END_ARG_INFO()
-
-static
-       ZEND_BEGIN_ARG_INFO(first_arg_auto_ref, 0)
-               ZEND_ARG_PASS_INFO(4)
-       ZEND_END_ARG_INFO()
-
-static
-       ZEND_BEGIN_ARG_INFO(first_and_second_args_auto_ref, 0)
-               ZEND_ARG_PASS_INFO(4)
-               ZEND_ARG_PASS_INFO(4)
-       ZEND_END_ARG_INFO()
-
 typedef struct _php_shutdown_function_entry {
        zval **arguments;
        int arg_count;
@@ -780,8 +764,8 @@ function_entry basic_functions[] = {
        PHP_FE(key,                                             first_arg_force_ref)
        PHP_FE(min,                                                                                                                             NULL)
        PHP_FE(max,                                                                                                                             NULL)
-       PHP_FE(in_array,                                first_and_second_args_auto_ref)
-       PHP_FE(array_search,                    first_and_second_args_auto_ref)
+       PHP_FE(in_array,                                                                                                                NULL)
+       PHP_FE(array_search,                                                                                                    NULL)
        PHP_FE(extract,                                                                                                                 NULL)
        PHP_FE(compact,                                                                                                                 NULL)
        PHP_FE(array_fill,                                                                                                              NULL)
@@ -793,8 +777,8 @@ function_entry basic_functions[] = {
        PHP_FE(array_unshift,                   first_arg_force_ref)
        PHP_FE(array_splice,                    first_arg_force_ref)
        PHP_FE(array_slice,                                                                                                             NULL)
-       PHP_FE(array_merge,                                                     all_args_auto_ref)
-       PHP_FE(array_merge_recursive,                           all_args_auto_ref)
+       PHP_FE(array_merge,                                                                                                             NULL)
+       PHP_FE(array_merge_recursive,                                                                                   NULL)
        PHP_FE(array_keys,                                                                                                              NULL)
        PHP_FE(array_values,                                                                                                    NULL)
        PHP_FE(array_count_values,                                                                                              NULL)
@@ -805,33 +789,33 @@ function_entry basic_functions[] = {
        PHP_FE(array_change_key_case,                                                                                   NULL)
        PHP_FE(array_rand,                                                                                                              NULL)
        PHP_FE(array_unique,                                                                                                    NULL)
-       PHP_FE(array_intersect,                                         all_args_auto_ref)
-       PHP_FE(array_intersect_key,                                     all_args_auto_ref)      
-       PHP_FE(array_intersect_ukey,                            all_args_auto_ref)
-       PHP_FE(array_uintersect,                                        all_args_auto_ref)
-       PHP_FE(array_intersect_assoc,                           all_args_auto_ref)
-       PHP_FE(array_uintersect_assoc,                          all_args_auto_ref)
-       PHP_FE(array_intersect_uassoc,                          all_args_auto_ref)
-       PHP_FE(array_uintersect_uassoc,                         all_args_auto_ref)
-       PHP_FE(array_diff,                                                      all_args_auto_ref)
-       PHP_FE(array_diff_key,                                          all_args_auto_ref)
-       PHP_FE(array_diff_ukey,                                         all_args_auto_ref)
-       PHP_FE(array_udiff,                                                     all_args_auto_ref)
-       PHP_FE(array_diff_assoc,                                        all_args_auto_ref)
-       PHP_FE(array_udiff_assoc,                                       all_args_auto_ref)
-       PHP_FE(array_diff_uassoc,                                       all_args_auto_ref)
-       PHP_FE(array_udiff_uassoc,                                      all_args_auto_ref)
-       PHP_FE(array_sum,                                                       first_arg_auto_ref)
-       PHP_FE(array_filter,                                            first_arg_auto_ref)
+       PHP_FE(array_intersect,                                                                                                 NULL)
+       PHP_FE(array_intersect_key,                                                                                             NULL)   
+       PHP_FE(array_intersect_ukey,                                                                                    NULL)
+       PHP_FE(array_uintersect,                                                                                                NULL)
+       PHP_FE(array_intersect_assoc,                                                                                   NULL)
+       PHP_FE(array_uintersect_assoc,                                                                                  NULL)
+       PHP_FE(array_intersect_uassoc,                                                                                  NULL)
+       PHP_FE(array_uintersect_uassoc,                                                                                 NULL)
+       PHP_FE(array_diff,                                                                                                              NULL)
+       PHP_FE(array_diff_key,                                                                                                  NULL)
+       PHP_FE(array_diff_ukey,                                                                                                 NULL)
+       PHP_FE(array_udiff,                                                                                                             NULL)
+       PHP_FE(array_diff_assoc,                                                                                                NULL)
+       PHP_FE(array_udiff_assoc,                                                                                               NULL)
+       PHP_FE(array_diff_uassoc,                                                                                               NULL)
+       PHP_FE(array_udiff_uassoc,                                                                                              NULL)
+       PHP_FE(array_sum,                                                                                                               NULL)
+       PHP_FE(array_filter,                                                                                                    NULL)
        PHP_FE(array_map,                                                                                                               NULL)
        PHP_FE(array_chunk,                                                                                                             NULL)
        PHP_FE(array_combine,                                                                                                   NULL)
-       PHP_FE(array_key_exists,                                        first_and_second_args_auto_ref)
+       PHP_FE(array_key_exists,                                                                                                NULL)
 
        /* aliases from array.c */
        PHP_FALIAS(pos,                                 current,                                 first_arg_force_ref)
        PHP_FALIAS(sizeof,                              count,                                                                  NULL)
-       PHP_FALIAS(key_exists,  array_key_exists,       first_and_second_args_auto_ref)
+       PHP_FALIAS(key_exists,                  array_key_exists,                                               NULL)
 
        /* functions from assert.c */
        PHP_FE(assert,                                                                                                                  NULL)