- Renaming key_exists to array_key_exists

@- Renamed key_exists tp array_key_exists. (Derick)
#- Not sure if this belongs in NEWS, but it was already in a released
#  version. And yes, I know I'm breaking BC here, but as it was not documented
#  yet, that doesn't matter.

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 4e931c76e747b634360a56656da76c71e7e6cf64..578f2dd7ac5fe4f502dab5cc73e41b2ed422572c 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -3238,18 +3238,18 @@ PHP_FUNCTION(array_map)
 /* }}} */
 
 
-/* {{{ proto bool key_exists(mixed key, array search)
+/* {{{ proto bool array_key_exists(mixed key, array search)
    Checks if the given key or index exists in the array */
-PHP_FUNCTION(key_exists)
+PHP_FUNCTION(array_key_exists)
 {
        zval **key,                                     /* key to check for */
                 **array;                               /* array to check in */
-       
+
        if (ZEND_NUM_ARGS() != 2 ||
                zend_get_parameters_ex(ZEND_NUM_ARGS(), &key, &array) == FAILURE) {
                WRONG_PARAM_COUNT;
        }
-       
+
        if (Z_TYPE_PP(array) != IS_ARRAY && Z_TYPE_PP(array) != IS_OBJECT) {
                php_error(E_WARNING, "Wrong datatype for second argument in call to %s", get_active_function_name(TSRMLS_C));
                RETURN_FALSE;
@@ -3272,7 +3272,7 @@ PHP_FUNCTION(key_exists)
                        php_error(E_WARNING, "Wrong datatype for first argument in call to %s", get_active_function_name(TSRMLS_C));
                        RETURN_FALSE;
        }
-                       
+
 }
 /* }}} */
 

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 94869275c6ce7c13832b80b325bade9d315f0794..c70bff2a2ed4ace78f3738b3c590d67aef1a3770 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -779,7 +779,7 @@ function_entry basic_functions[] = {
        PHP_FE(array_filter,                                                                                                    NULL)
        PHP_FE(array_map,                                                                                                               NULL)
        PHP_FE(array_chunk,                                                                                                             NULL)
-       PHP_FE(key_exists,                                                                                                              NULL)
+       PHP_FE(array_key_exists,                                                                                                                NULL)
 
        /* aliases from array.c */
        PHP_FALIAS(pos,                                 current,                                 first_arg_force_ref)

diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h
index 0292b2416e7a458b70d328062d999a36755d4d49..73b17bde92b51b58da0227b9fbdfc2607a492dc8 100644 (file)
--- a/ext/standard/php_array.h
+++ b/ext/standard/php_array.h
@@ -79,7 +79,7 @@ PHP_FUNCTION(array_diff);
 PHP_FUNCTION(array_sum);
 PHP_FUNCTION(array_filter);
 PHP_FUNCTION(array_map);
-PHP_FUNCTION(key_exists);
+PHP_FUNCTION(array_key_exists);
 PHP_FUNCTION(array_chunk);
 
 HashTable* php_splice(HashTable *, int, int, zval ***, int, HashTable **);