Fix iterable<K,V> not accepted as array<K,V>|Traversable<K,V>

- Fixed IterableType::isSubTypeOf to decompose iterable<K,V> into
  array<K,V>|GenericObjectType(Traversable<K,V>) instead of
  array<K,V>|(ObjectType(Traversable)&iterable<K,V>), preserving
  generic type information for proper subtype checking
- Fixed UnionType::inferTemplateTypes to decompose IterableType into
  array|Traversable union before template inference, allowing template
  types to be correctly resolved from iterable arguments
- Added regression test for phpstan/phpstan#13247

Closes phpstan/phpstan#13247

Author: VincentLanglet

phpstan-baseline.neon

@@ -1776,7 +1776,7 @@ parameters:
 		-
 			rawMessage: 'Doing instanceof PHPStan\Type\IterableType is error-prone and deprecated. Use Type::isIterable() instead.'
 			identifier: phpstanApi.instanceofType
-			count: 1
+			count: 2
 			path: src/Type/UnionType.php
 
 		-

src/Type/IterableType.php

@@ -138,9 +138,9 @@ public function isSubTypeOf(Type $otherType): IsSuperTypeOfResult
 		if ($otherType instanceof IntersectionType || $otherType instanceof UnionType) {
 			return $otherType->isSuperTypeOf(new UnionType([
 				new ArrayType($this->keyType, $this->itemType),
-				new IntersectionType([
-					new ObjectType(Traversable::class),
-					$this,
+				new GenericObjectType(Traversable::class, [
+					$this->keyType,
+					$this->itemType,
 				]),
 			]));
 		}

src/Type/UnionType.php

@@ -25,6 +25,7 @@
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Enum\EnumCaseObjectType;
 use PHPStan\Type\Generic\GenericClassStringType;
+use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\Generic\TemplateIterableType;
 use PHPStan\Type\Generic\TemplateMixedType;
 use PHPStan\Type\Generic\TemplateType;
@@ -33,6 +34,7 @@
 use PHPStan\Type\Generic\TemplateUnionType;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
 use Throwable;
+use Traversable;
 use function array_diff_assoc;
 use function array_fill_keys;
 use function array_map;
@@ -1073,6 +1075,16 @@ public function toCoercedArgumentType(bool $strictTypes): Type
 
 	public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 	{
+		if ($receivedType instanceof IterableType && !$receivedType instanceof TemplateIterableType) {
+			return $this->inferTemplateTypes(new UnionType([
+				new ArrayType($receivedType->getKeyType(), $receivedType->getItemType()),
+				new GenericObjectType(Traversable::class, [
+					$receivedType->getKeyType(),
+					$receivedType->getItemType(),
+				]),
+			]));
+		}
+
 		$types = TemplateTypeMap::createEmpty();
 		if ($receivedType instanceof UnionType) {
 			$myTypes = [];

tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php

@@ -2735,4 +2735,9 @@ public function testBug10559(): void
 		$this->analyse([__DIR__ . '/data/bug-10559.php'], []);
 	}
 
+	public function testBug13247(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-13247.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Functions/data/bug-13247.php

@@ -0,0 +1,35 @@
+<?php // lint >= 8.0
+
+declare(strict_types = 1);
+
+namespace Bug13247;
+
+use Traversable;
+
+/**
+ * @template K as array-key
+ * @template V
+ *
+ * @param array<K, V>|Traversable<K, V> $input
+ *
+ * @return array<K, V>
+ */
+function as_array(array|Traversable $input): array {
+    if ($input instanceof Traversable) {
+        return iterator_to_array($input);
+    }
+
+    return $input;
+}
+
+/**
+ * @template K as array-key
+ * @template V
+ *
+ * @param iterable<K, V> $input
+ *
+ * @return array<K, V>
+ */
+function iter_as_array(iterable $input): array {
+    return as_array($input);
+}