diff options
| author | Tjerk Meesters <datibbaw@php.net> | 2013-09-27 07:42:33 +0800 |
|---|---|---|
| committer | Tjerk Meesters <datibbaw@php.net> | 2013-09-28 00:06:04 +0800 |
| commit | 75ba75e2055d670e204e6361732995ba27b05896 (patch) | |
| tree | f4de36176a9f1d9825edd47490640a8a856179c0 | |
| parent | 0492145e58bda8fed9f64992a9b8d054d9c80758 (diff) | |
| download | php-git-75ba75e2055d670e204e6361732995ba27b05896.tar.gz | |
Using only two constants to signal use type intent.
| -rw-r--r-- | ext/standard/array.c | 7 | ||||
| -rw-r--r-- | ext/standard/php_array.h | 1 | ||||
| -rw-r--r-- | ext/standard/tests/array/array_filter_variation10.phpt | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 13148ec6f0..5968a41dd5 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -129,7 +129,6 @@ PHP_MINIT_FUNCTION(array) /* {{{ */ REGISTER_LONG_CONSTANT("ARRAY_FILTER_USE_BOTH", ARRAY_FILTER_USE_BOTH, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("ARRAY_FILTER_USE_KEY", ARRAY_FILTER_USE_KEY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("ARRAY_FILTER_USE_VALUE", ARRAY_FILTER_USE_VALUE, CONST_CS | CONST_PERSISTENT); return SUCCESS; } @@ -4202,7 +4201,7 @@ PHP_FUNCTION(array_filter) zval *retval = NULL; zval *key = NULL; zend_bool have_callback = 0; - long use_type = ARRAY_FILTER_USE_VALUE; + long use_type = 0; char *string_key; zend_fcall_info fci = empty_fcall_info; zend_fcall_info_cache fci_cache = empty_fcall_info_cache; @@ -4242,7 +4241,7 @@ PHP_FUNCTION(array_filter) int key_type = zend_hash_get_current_key_ex(Z_ARRVAL_P(array), &string_key, &string_key_len, &num_key, 0, &pos); if (have_callback) { - if (use_type != ARRAY_FILTER_USE_VALUE) { + if (use_type) { MAKE_STD_ZVAL(key); /* Set up the key */ switch (key_type) { @@ -4266,7 +4265,7 @@ PHP_FUNCTION(array_filter) int retval_true = zend_is_true(retval); zval_ptr_dtor(&retval); - if (use_type != ARRAY_FILTER_USE_VALUE) { + if (use_type) { zval_ptr_dtor(&key); } if (!retval_true) { diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index 7d9733d296..ef43cddfcc 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -119,7 +119,6 @@ PHPAPI int php_multisort_compare(const void *a, const void *b TSRMLS_DC); #define ARRAY_FILTER_USE_BOTH 1 #define ARRAY_FILTER_USE_KEY 2 -#define ARRAY_FILTER_USE_VALUE 3 ZEND_BEGIN_MODULE_GLOBALS(array) int *multisort_flags[2]; diff --git a/ext/standard/tests/array/array_filter_variation10.phpt b/ext/standard/tests/array/array_filter_variation10.phpt index 25698c55c2..f0a6115f79 100644 --- a/ext/standard/tests/array/array_filter_variation10.phpt +++ b/ext/standard/tests/array/array_filter_variation10.phpt @@ -42,7 +42,7 @@ $mixed = array(1 => 'a', 2 => 'b', 'a' => 1, 'b' => 2); var_dump(array_filter($mixed, 'is_numeric', ARRAY_FILTER_USE_KEY)); -var_dump(array_filter($mixed, 'is_numeric', ARRAY_FILTER_USE_VALUE)); +var_dump(array_filter($mixed, 'is_numeric', 0)); var_dump(array_filter($mixed, 'is_numeric', ARRAY_FILTER_USE_BOTH)); |