@@ -6728,7 +6728,7 @@ PHP_FUNCTION(array_all)
67286728PHP_FUNCTION (array_map )
67296729{
67306730 zval * arrays = NULL ;
6731- int n_arrays = 0 ;
6731+ uint32_t n_arrays = 0 ;
67326732 zval result ;
67336733 zend_fcall_info fci = empty_fcall_info ;
67346734 zend_fcall_info_cache fci_cache = empty_fcall_info_cache ;
@@ -6744,7 +6744,6 @@ PHP_FUNCTION(array_map)
67446744 zend_ulong num_key ;
67456745 zend_string * str_key ;
67466746 zval * zv , arg ;
6747- int ret ;
67486747
67496748 if (Z_TYPE (arrays [0 ]) != IS_ARRAY ) {
67506749 zend_argument_type_error (2 , "must be of type array, %s given" , zend_zval_value_name (& arrays [0 ]));
@@ -6766,7 +6765,7 @@ PHP_FUNCTION(array_map)
67666765 fci .params = & arg ;
67676766
67686767 ZVAL_COPY (& arg , zv );
6769- ret = zend_call_function (& fci , & fci_cache );
6768+ zend_result ret = zend_call_function (& fci , & fci_cache );
67706769 i_zval_ptr_dtor (& arg );
67716770 if (ret != SUCCESS || Z_TYPE (result ) == IS_UNDEF ) {
67726771 zend_array_destroy (Z_ARR_P (return_value ));
@@ -6946,7 +6945,6 @@ PHP_FUNCTION(array_key_exists)
69466945/* {{{ Split array into chunks */
69476946PHP_FUNCTION (array_chunk )
69486947{
6949- int num_in ;
69506948 zend_long size , current = 0 ;
69516949 zend_string * str_key ;
69526950 zend_ulong num_key ;
@@ -6968,7 +6966,7 @@ PHP_FUNCTION(array_chunk)
69686966 RETURN_THROWS ();
69696967 }
69706968
6971- num_in = zend_hash_num_elements (Z_ARRVAL_P (input ));
6969+ uint32_t num_in = zend_hash_num_elements (Z_ARRVAL_P (input ));
69726970
69736971 if (size > num_in ) {
69746972 if (num_in == 0 ) {
@@ -7020,15 +7018,14 @@ PHP_FUNCTION(array_combine)
70207018 HashTable * values , * keys ;
70217019 uint32_t pos_values = 0 ;
70227020 zval * entry_keys , * entry_values ;
7023- int num_keys , num_values ;
70247021
70257022 ZEND_PARSE_PARAMETERS_START (2 , 2 )
70267023 Z_PARAM_ARRAY_HT (keys )
70277024 Z_PARAM_ARRAY_HT (values )
70287025 ZEND_PARSE_PARAMETERS_END ();
70297026
7030- num_keys = zend_hash_num_elements (keys );
7031- num_values = zend_hash_num_elements (values );
7027+ uint32_t num_keys = zend_hash_num_elements (keys );
7028+ uint32_t num_values = zend_hash_num_elements (values );
70327029
70337030 if (num_keys != num_values ) {
70347031 zend_argument_value_error (1 , "and argument #2 ($values) must have the same number of elements" );
0 commit comments