Add proper count() parameter type

We can make this Countable|array now.

diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
index eea47c664fa46dc05be46d0ac4c274e2a8719729..ec0e056dac9a00927b4f3f3911ef4256ea1528e8 100755 (executable)
--- a/ext/standard/basic_functions.stub.php
+++ b/ext/standard/basic_functions.stub.php
@@ -62,14 +62,10 @@ function krsort(array &$array, int $flags = SORT_REGULAR): bool {}
 
 function ksort(array &$array, int $flags = SORT_REGULAR): bool {}
 
-/** @param Countable|array $var */
-function count($var, int $mode = COUNT_NORMAL): int {}
+function count(Countable|array $var, int $mode = COUNT_NORMAL): int {}
 
-/**
- * @param Countable|array $var
- * @alias count
- */
-function sizeof($var, int $mode = COUNT_NORMAL): int {}
+/** @alias count */
+function sizeof(Countable|array $var, int $mode = COUNT_NORMAL): int {}
 
 function natsort(array &$array): bool {}
 

diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
index e044eef24ef202a43829434e50adaf767eb590cf..5e19997bb46487dc0cbda9b3670100c629cef5d1 100644 (file)
--- a/ext/standard/basic_functions_arginfo.h
+++ b/ext/standard/basic_functions_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 5275c2ba801f36ecf17e6b615b19373aca34e852 */
+ * Stub hash: 97187c073137b8fdfc03bdecf72377ef73d79290 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
        ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -82,7 +82,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_ksort arginfo_krsort
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_count, 0, 1, IS_LONG, 0)
-       ZEND_ARG_INFO(0, var)
+       ZEND_ARG_OBJ_TYPE_MASK(0, var, Countable, MAY_BE_ARRAY, NULL)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "COUNT_NORMAL")
 ZEND_END_ARG_INFO()