diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-04-30 18:32:42 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-04-30 18:32:42 +0400 |
| commit | 17d027ed47c1f07b397a611431d28ad0e0107146 (patch) | |
| tree | da6cadcd3ca0cad02dd4ff39f027575070873cbd /ext/standard/array.c | |
| parent | 6a911e833f6b6dcac669a60808e96dc2c4f391d3 (diff) | |
| download | php-git-17d027ed47c1f07b397a611431d28ad0e0107146.tar.gz | |
Split IS_BOOL into IS_FALSE and IS_TRUE
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 3d587fa98e..eb8a9cd325 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -933,7 +933,7 @@ PHP_FUNCTION(min) for (i = 1; i < argc; i++) { is_smaller_function(&result, &args[i], min TSRMLS_CC); - if (Z_LVAL(result) == 1) { + if (Z_TYPE(result) == IS_TRUE) { min = &args[i]; } } @@ -980,7 +980,7 @@ PHP_FUNCTION(max) for (i = 1; i < argc; i++) { is_smaller_or_equal_function(&result, &args[i], max TSRMLS_CC); - if (Z_LVAL(result) == 0) { + if (Z_TYPE(result) == IS_FALSE) { max = &args[i]; } } @@ -1166,7 +1166,7 @@ static void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior) /* {{{ if (strict) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(array), num_idx, str_idx, entry) { is_identical_function(&res, value, entry TSRMLS_CC); - if (Z_LVAL(res)) { + if (Z_TYPE(res) == IS_TRUE) { if (behavior == 0) { RETURN_TRUE; } else { @@ -1181,7 +1181,7 @@ static void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior) /* {{{ } ZEND_HASH_FOREACH_END(); } else { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(array), num_idx, str_idx, entry) { - if (fast_equal_function(&res, value, entry TSRMLS_CC)) { + if (fast_equal_check_function(&res, value, entry TSRMLS_CC)) { if (behavior == 0) { RETURN_TRUE; } else { |