Introduce method

Author: VincentLanglet

src/Type/IterableType.php

@@ -137,11 +137,8 @@ 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 GenericObjectType(Traversable::class, [
-					$this->keyType,
-					$this->itemType,
-				]),
+				$this->toArray(),
+				$this->toTraversable(),
 			]));
 		}
 
@@ -250,10 +247,7 @@ public function toCoercedArgumentType(bool $strictTypes): Type
 				),
 				$this->itemType,
 			),
-			new GenericObjectType(Traversable::class, [
-				$this->keyType,
-				$this->itemType,
-			]),
+			$this->toTraversable(),
 		);
 	}
 
@@ -481,15 +475,12 @@ public function tryRemove(Type $typeToRemove): ?Type
 	{
 		$arrayType = new ArrayType(new MixedType(), new MixedType());
 		if ($typeToRemove->isSuperTypeOf($arrayType)->yes()) {
-			return new GenericObjectType(Traversable::class, [
-				$this->getIterableKeyType(),
-				$this->getIterableValueType(),
-			]);
+			return $this->toTraversable();
 		}
 
 		$traversableType = new ObjectType(Traversable::class);
 		if ($typeToRemove->isSuperTypeOf($traversableType)->yes()) {
-			return new ArrayType($this->getIterableKeyType(), $this->getIterableValueType());
+			return $this->toArray();
 		}
 
 		return null;
@@ -537,4 +528,12 @@ public function hasTemplateOrLateResolvableType(): bool
 		return $this->keyType->hasTemplateOrLateResolvableType() || $this->itemType->hasTemplateOrLateResolvableType();
 	}
 
+	public function toTraversable(): Type
+	{
+		return new GenericObjectType(Traversable::class, [
+			$this->keyType,
+			$this->itemType,
+		]);
+	}
+
 }

src/Type/UnionType.php

@@ -25,7 +25,6 @@
 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;
@@ -34,7 +33,6 @@
 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;
@@ -198,11 +196,8 @@ public function accepts(Type $type, bool $strictTypes): AcceptsResult
 	{
 		if ($type instanceof IterableType) {
 			return $this->accepts(new UnionType([
-				new ArrayType($type->getIterableKeyType(), $type->getIterableValueType()),
-				new GenericObjectType(Traversable::class, [
-					$type->getIterableKeyType(),
-					$type->getIterableValueType(),
-				]),
+				$type->toArray(),
+				$type->toTraversable(),
 			]), $strictTypes);
 		}
 
@@ -1087,11 +1082,8 @@ public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 	{
 		if ($receivedType instanceof IterableType) {
 			$receivedType = new UnionType([
-				new ArrayType($receivedType->getIterableKeyType(), $receivedType->getIterableValueType()),
-				new GenericObjectType(Traversable::class, [
-					$receivedType->getIterableKeyType(),
-					$receivedType->getIterableValueType(),
-				]),
+				$receivedType->toArray(),
+				$receivedType->toTraversable(),
 			]);
 		}