Make iterator_count() accept all iterables

Author: TimWolla

ext/spl/php_spl.stub.php

@@ -48,7 +48,7 @@ function spl_object_id(object $object): int {}
 
 function iterator_apply(Traversable $iterator, callable $callback, ?array $args = null): int {}
 
-function iterator_count(Traversable $iterator): int {}
+function iterator_count(iterable $iterator): int {}
 
 /** @refcount 1 */
 function iterator_to_array(iterable $iterator, bool $preserve_keys = true): array {}

ext/spl/php_spl_arginfo.h

@@ -3205,12 +3205,16 @@ PHP_FUNCTION(iterator_count)
 	zval  *obj;
 	zend_long  count = 0;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &obj, zend_ce_traversable) == FAILURE) {
-		RETURN_THROWS();
-	}
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_ITERABLE(obj)
+	ZEND_PARSE_PARAMETERS_END();
 
-	if (spl_iterator_apply(obj, spl_iterator_count_apply, (void*)&count) == FAILURE) {
-		return;
+	if (Z_TYPE_P(obj) == IS_ARRAY) {
+		count =  zend_hash_num_elements(Z_ARRVAL_P(obj));
+	} else {
+		if (spl_iterator_apply(obj, spl_iterator_count_apply, (void*)&count) == FAILURE) {
+			return;
+		}
 	}
 
 	RETURN_LONG(count);

ext/spl/spl_iterators.c

@@ -13,7 +13,7 @@ iterator_count('1');
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: iterator_count(): Argument #1 ($iterator) must be of type Traversable, string given in %s:%d
+Fatal error: Uncaught TypeError: iterator_count(): Argument #1 ($iterator) must be of type Traversable|array, string given in %s:%d
 Stack trace:
 #0 %s(%d): iterator_count('1')
 #1 {main}

ext/spl/tests/iterator_count.phpt

@@ -0,0 +1,14 @@
+--TEST--
+SPL: iterator_count() supports arrays.
+--FILE--
+<?php
+
+var_dump(iterator_count([]));
+var_dump(iterator_count([1]));
+var_dump(iterator_count(['a' => 1, 'b' => 2, 5 => 3]));
+
+?>
+--EXPECTF--
+int(0)
+int(1)
+int(3)