Update return type for range, array_chunk, and array_combine

Author: theodorejb

ext/standard/array.c

@@ -6334,7 +6334,7 @@ PHP_FUNCTION(array_key_exists)
 }
 /* }}} */
 
-/* {{{ proto array|null array_chunk(array input, int size [, bool preserve_keys])
+/* {{{ proto array array_chunk(array input, int size [, bool preserve_keys])
    Split array into chunks */
 PHP_FUNCTION(array_chunk)
 {

ext/standard/basic_functions.stub.php

@@ -152,9 +152,8 @@ function array_fill_keys(array $keys, $val): array {}
  * @param int|float|string $low
  * @param int|float|string $high
  * @param int|float $step
- * @return array|false
  */
-function range($low, $high, $step = 1) {}
+function range($low, $high, $step = 1): array {}
 
 function shuffle(array &$arg): bool {}
 
@@ -269,10 +268,9 @@ function array_map(?callable $callback, array $arr1, array ...$arrays): array {}
  */
 function array_key_exists($key, $search): bool {}
 
-function array_chunk(array $arg, int $size, bool $preserve_keys = false): ?array {}
+function array_chunk(array $arg, int $size, bool $preserve_keys = false): array {}
 
-/** @return array|false */
-function array_combine(array $keys, array $values) {}
+function array_combine(array $keys, array $values): array {}
 
 /* base64.c */
 

ext/standard/basic_functions_arginfo.h

@@ -172,7 +172,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_fill_keys, 0, 2, IS_ARRAY,
 	ZEND_ARG_INFO(0, val)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_range, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_range, 0, 2, IS_ARRAY, 0)
 	ZEND_ARG_INFO(0, low)
 	ZEND_ARG_INFO(0, high)
 	ZEND_ARG_INFO(0, step)
@@ -344,13 +344,13 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_key_exists, 0, 2, _IS_BOOL
 	ZEND_ARG_INFO(0, search)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_chunk, 0, 2, IS_ARRAY, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_chunk, 0, 2, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, preserve_keys, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_array_combine, 0, 0, 2)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_combine, 0, 2, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, keys, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, values, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()