Skip to content

Commit 192170a

Browse files
carusogabrielcarusogabriel
committed
Add return type to some array_* functions
1 parent 2cfb525 commit 192170a

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

‎ext/standard/array.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2713,7 +2713,7 @@ PHP_FUNCTION(array_fill_keys)
27132713
zend_hash_real_init_packed(Z_ARRVAL_P(return_value)); \
27142714
} while (0)
27152715

2716-
/* {{{ proto array range(mixed low, mixed high[, int step])
2716+
/* {{{ proto array|false range(mixed low, mixed high[, int step])
27172717
Create an array containing the range of integers or characters from low to high (inclusive) */
27182718
PHP_FUNCTION(range)
27192719
{
@@ -3136,7 +3136,7 @@ static void php_splice(HashTable *in_hash, zend_long offset, zend_long length, H
31363136
}
31373137
/* }}} */
31383138

3139-
/* {{{ proto int array_push(array stack, mixed var [, mixed ...])
3139+
/* {{{ proto int|false array_push(array stack, mixed var [, mixed ...])
31403140
Pushes elements onto the end of the array */
31413141
PHP_FUNCTION(array_push)
31423142
{
@@ -3382,7 +3382,7 @@ PHP_FUNCTION(array_unshift)
33823382
}
33833383
/* }}} */
33843384

3385-
/* {{{ proto array array_splice(array input, int offset [, int length [, array replacement]])
3385+
/* {{{ proto array|null array_splice(array input, int offset [, int length [, array replacement]])
33863386
Removes the elements designated by offset and length and replace them with supplied array */
33873387
PHP_FUNCTION(array_splice)
33883388
{
@@ -4308,7 +4308,7 @@ PHP_FUNCTION(array_reverse)
43084308
}
43094309
/* }}} */
43104310

4311-
/* {{{ proto array array_pad(array input, int pad_size, mixed pad_value)
4311+
/* {{{ proto array|false array_pad(array input, int pad_size, mixed pad_value)
43124312
Returns a copy of input array padded with pad_value to size pad_size */
43134313
PHP_FUNCTION(array_pad)
43144314
{
@@ -5897,7 +5897,7 @@ PHP_FUNCTION(array_rand)
58975897
}
58985898
/* }}} */
58995899

5900-
/* {{{ proto mixed array_sum(array input)
5900+
/* {{{ proto int|float array_sum(array input)
59015901
Returns the sum of the array entries */
59025902
PHP_FUNCTION(array_sum)
59035903
{
@@ -5922,7 +5922,7 @@ PHP_FUNCTION(array_sum)
59225922
}
59235923
/* }}} */
59245924

5925-
/* {{{ proto mixed array_product(array input)
5925+
/* {{{ proto int|float array_product(array input)
59265926
Returns the product of the array entries */
59275927
PHP_FUNCTION(array_product)
59285928
{

‎ext/standard/basic_functions.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -292,19 +292,19 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_max, 0, 0, 1)
292292
ZEND_ARG_VARIADIC_INFO(0, args)
293293
ZEND_END_ARG_INFO()
294294

295-
ZEND_BEGIN_ARG_INFO_EX(arginfo_array_walk, 0, 0, 2)
295+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_walk, 0, 2, _IS_BOOL, 0)
296296
ZEND_ARG_INFO(1, input) /* ARRAY_INFO(1, arg, 0) */
297297
ZEND_ARG_INFO(0, funcname)
298298
ZEND_ARG_INFO(0, userdata)
299299
ZEND_END_ARG_INFO()
300300

301-
ZEND_BEGIN_ARG_INFO_EX(arginfo_array_walk_recursive, 0, 0, 2)
301+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_walk_recursive, 0, 2, _IS_BOOL, 0)
302302
ZEND_ARG_INFO(1, input) /* ARRAY_INFO(1, arg, 0) */
303303
ZEND_ARG_INFO(0, funcname)
304304
ZEND_ARG_INFO(0, userdata)
305305
ZEND_END_ARG_INFO()
306306

307-
ZEND_BEGIN_ARG_INFO_EX(arginfo_in_array, 0, 0, 2)
307+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_in_array, 0, 2, _IS_BOOL, 0)
308308
ZEND_ARG_INFO(0, needle)
309309
ZEND_ARG_INFO(0, haystack) /* ARRAY_INFO(0, haystack, 0) */
310310
ZEND_ARG_INFO(0, strict)
@@ -332,7 +332,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_array_fill, 0)
332332
ZEND_ARG_INFO(0, val)
333333
ZEND_END_ARG_INFO()
334334

335-
ZEND_BEGIN_ARG_INFO(arginfo_array_fill_keys, 0)
335+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(arginfo_array_fill_keys, IS_ARRAY, 0)
336336
ZEND_ARG_INFO(0, keys) /* ARRAY_INFO(0, keys, 0) */
337337
ZEND_ARG_INFO(0, val)
338338
ZEND_END_ARG_INFO()
@@ -360,7 +360,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_array_shift, 0)
360360
ZEND_ARG_INFO(1, stack) /* ARRAY_INFO(1, stack, 0) */
361361
ZEND_END_ARG_INFO()
362362

363-
ZEND_BEGIN_ARG_INFO_EX(arginfo_array_unshift, 0, 0, 1)
363+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_unshift, 0, 1, IS_LONG, 0)
364364
ZEND_ARG_INFO(1, stack) /* ARRAY_INFO(1, stack, 0) */
365365
ZEND_ARG_VARIADIC_INFO(0, vars)
366366
ZEND_END_ARG_INFO()
@@ -372,18 +372,18 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_array_splice, 0, 0, 2)
372372
ZEND_ARG_INFO(0, replacement) /* ARRAY_INFO(0, arg, 1) */
373373
ZEND_END_ARG_INFO()
374374

375-
ZEND_BEGIN_ARG_INFO_EX(arginfo_array_slice, 0, 0, 2)
375+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_slice, 0, 2, IS_ARRAY, 0)
376376
ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(1, arg, 0) */
377377
ZEND_ARG_INFO(0, offset)
378378
ZEND_ARG_INFO(0, length)
379379
ZEND_ARG_INFO(0, preserve_keys)
380380
ZEND_END_ARG_INFO()
381381

382-
ZEND_BEGIN_ARG_INFO_EX(arginfo_array_merge, 0, 0, 0)
382+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_merge, 0, 0, IS_ARRAY, 0)
383383
ZEND_ARG_VARIADIC_INFO(0, arrays)
384384
ZEND_END_ARG_INFO()
385385

386-
ZEND_BEGIN_ARG_INFO_EX(arginfo_array_merge_recursive, 0, 0, 0)
386+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_merge_recursive, 0, 0, IS_ARRAY, 0)
387387
ZEND_ARG_VARIADIC_INFO(0, arrays)
388388
ZEND_END_ARG_INFO()
389389

@@ -397,7 +397,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_array_replace_recursive, 0, 0, 1)
397397
ZEND_ARG_VARIADIC_INFO(0, arrays)
398398
ZEND_END_ARG_INFO()
399399

400-
ZEND_BEGIN_ARG_INFO_EX(arginfo_array_keys, 0, 0, 1)
400+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_keys, 0, 1, IS_ARRAY, 0)
401401
ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
402402
ZEND_ARG_INFO(0, search_value)
403403
ZEND_ARG_INFO(0, strict)
@@ -412,7 +412,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_array_key_last, 0)
412412
ZEND_END_ARG_INFO()
413413

414414

415-
ZEND_BEGIN_ARG_INFO(arginfo_array_values, 0)
415+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(arginfo_array_values, IS_ARRAY, 0)
416416
ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
417417
ZEND_END_ARG_INFO()
418418

@@ -426,7 +426,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_array_column, 0, 0, 2)
426426
ZEND_ARG_INFO(0, index_key)
427427
ZEND_END_ARG_INFO()
428428

429-
ZEND_BEGIN_ARG_INFO_EX(arginfo_array_reverse, 0, 0, 1)
429+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_reverse, 0, 1, IS_ARRAY, 0)
430430
ZEND_ARG_INFO(0, input) /* ARRAY_INFO(0, arg, 0) */
431431
ZEND_ARG_INFO(0, preserve_keys)
432432
ZEND_END_ARG_INFO()
@@ -437,16 +437,16 @@ ZEND_BEGIN_ARG_INFO(arginfo_array_pad, 0)
437437
ZEND_ARG_INFO(0, pad_value)
438438
ZEND_END_ARG_INFO()
439439

440-
ZEND_BEGIN_ARG_INFO(arginfo_array_flip, 0)
440+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(arginfo_array_flip, IS_ARRAY, 0)
441441
ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
442442
ZEND_END_ARG_INFO()
443443

444-
ZEND_BEGIN_ARG_INFO_EX(arginfo_array_change_key_case, 0, 0, 1)
444+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_change_key_case, 0, 1, IS_ARRAY, 0)
445445
ZEND_ARG_INFO(0, input) /* ARRAY_INFO(0, arg, 0) */
446446
ZEND_ARG_INFO(0, case)
447447
ZEND_END_ARG_INFO()
448448

449-
ZEND_BEGIN_ARG_INFO_EX(arginfo_array_unique, 0, 0, 1)
449+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_unique, 0, 1, IS_ARRAY, 0)
450450
ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
451451
ZEND_ARG_INFO(0, flags)
452452
ZEND_END_ARG_INFO()
@@ -569,7 +569,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_array_reduce, 0, 0, 2)
569569
ZEND_ARG_INFO(0, initial)
570570
ZEND_END_ARG_INFO()
571571

572-
ZEND_BEGIN_ARG_INFO_EX(arginfo_array_filter, 0, 0, 1)
572+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_filter, 0, 1, IS_ARRAY, 0)
573573
ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
574574
ZEND_ARG_INFO(0, callback)
575575
ZEND_ARG_INFO(0, use_keys)
@@ -580,7 +580,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_array_map, 0, 0, 2)
580580
ZEND_ARG_VARIADIC_INFO(0, arrays)
581581
ZEND_END_ARG_INFO()
582582

583-
ZEND_BEGIN_ARG_INFO(arginfo_array_key_exists, 0)
583+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(arginfo_array_key_exists, _IS_BOOL, 0)
584584
ZEND_ARG_INFO(0, key)
585585
ZEND_ARG_INFO(0, search)
586586
ZEND_END_ARG_INFO()

0 commit comments

Comments
 (0)