@@ -4199,50 +4199,46 @@ PHP_FUNCTION(array_column)
4199
4199
/* Failure will leave keyval alone which will land us on the final else block below
4200
4200
* which is to append the value as next_index
4201
4201
*/
4202
- if (index ) {
4203
- zval rv ;
4204
- zval * keyval = array_column_fetch_prop (data , index , & rv );
4205
-
4206
- if (keyval ) {
4207
- switch (Z_TYPE_P (keyval )) {
4208
- case IS_STRING :
4209
- zend_symtable_update (Z_ARRVAL_P (return_value ), Z_STR_P (keyval ), colval );
4210
- break ;
4211
- case IS_LONG :
4212
- zend_hash_index_update (Z_ARRVAL_P (return_value ), Z_LVAL_P (keyval ), colval );
4213
- break ;
4214
- case IS_OBJECT :
4215
- {
4216
- zend_string * tmp_key ;
4217
- zend_string * key = zval_get_tmp_string (keyval , & tmp_key );
4218
- zend_symtable_update (Z_ARRVAL_P (return_value ), key , colval );
4219
- zend_tmp_string_release (tmp_key );
4220
- break ;
4221
- }
4222
- case IS_NULL :
4223
- zend_hash_update (Z_ARRVAL_P (return_value ), ZSTR_EMPTY_ALLOC (), colval );
4224
- break ;
4225
- case IS_DOUBLE :
4226
- zend_hash_index_update (Z_ARRVAL_P (return_value ),
4227
- zend_dval_to_lval (Z_DVAL_P (keyval )), colval );
4228
- break ;
4229
- case IS_TRUE :
4230
- zend_hash_index_update (Z_ARRVAL_P (return_value ), 1 , colval );
4231
- break ;
4232
- case IS_FALSE :
4233
- zend_hash_index_update (Z_ARRVAL_P (return_value ), 0 , colval );
4234
- break ;
4235
- case IS_RESOURCE :
4236
- zend_hash_index_update (Z_ARRVAL_P (return_value ), Z_RES_HANDLE_P (keyval ), colval );
4237
- break ;
4238
- default :
4239
- zend_hash_next_index_insert (Z_ARRVAL_P (return_value ), colval );
4202
+ zval rv ;
4203
+ zval * keyval = array_column_fetch_prop (data , index , & rv );
4204
+
4205
+ if (keyval ) {
4206
+ switch (Z_TYPE_P (keyval )) {
4207
+ case IS_STRING :
4208
+ zend_symtable_update (Z_ARRVAL_P (return_value ), Z_STR_P (keyval ), colval );
4209
+ break ;
4210
+ case IS_LONG :
4211
+ zend_hash_index_update (Z_ARRVAL_P (return_value ), Z_LVAL_P (keyval ), colval );
4212
+ break ;
4213
+ case IS_OBJECT :
4214
+ {
4215
+ zend_string * tmp_key ;
4216
+ zend_string * key = zval_get_tmp_string (keyval , & tmp_key );
4217
+ zend_symtable_update (Z_ARRVAL_P (return_value ), key , colval );
4218
+ zend_tmp_string_release (tmp_key );
4240
4219
break ;
4241
- }
4242
- zval_ptr_dtor (keyval );
4243
- } else {
4244
- zend_hash_next_index_insert (Z_ARRVAL_P (return_value ), colval );
4220
+ }
4221
+ case IS_NULL :
4222
+ zend_hash_update (Z_ARRVAL_P (return_value ), ZSTR_EMPTY_ALLOC (), colval );
4223
+ break ;
4224
+ case IS_DOUBLE :
4225
+ zend_hash_index_update (Z_ARRVAL_P (return_value ),
4226
+ zend_dval_to_lval (Z_DVAL_P (keyval )), colval );
4227
+ break ;
4228
+ case IS_TRUE :
4229
+ zend_hash_index_update (Z_ARRVAL_P (return_value ), 1 , colval );
4230
+ break ;
4231
+ case IS_FALSE :
4232
+ zend_hash_index_update (Z_ARRVAL_P (return_value ), 0 , colval );
4233
+ break ;
4234
+ case IS_RESOURCE :
4235
+ zend_hash_index_update (Z_ARRVAL_P (return_value ), Z_RES_HANDLE_P (keyval ), colval );
4236
+ break ;
4237
+ default :
4238
+ zend_hash_next_index_insert (Z_ARRVAL_P (return_value ), colval );
4239
+ break ;
4245
4240
}
4241
+ zval_ptr_dtor (keyval );
4246
4242
} else {
4247
4243
zend_hash_next_index_insert (Z_ARRVAL_P (return_value ), colval );
4248
4244
}
0 commit comments