Rework

Author: VincentLanglet

src/Type/IterableType.php

@@ -136,10 +136,7 @@ private function isNestedTypeSuperTypeOf(Type $a, Type $b): IsSuperTypeOfResult
 	public function isSubTypeOf(Type $otherType): IsSuperTypeOfResult
 	{
 		if ($otherType instanceof IntersectionType || $otherType instanceof UnionType) {
-			return $otherType->isSuperTypeOf(new UnionType([
-				$this->toArray(),
-				$this->toTraversable(),
-			]));
+			return $otherType->isSuperTypeOf($this->toArrayOrTraversable());
 		}
 
 		if ($otherType instanceof self) {
@@ -228,6 +225,17 @@ public function toArray(): Type
 		return new ArrayType($this->keyType, $this->getItemType());
 	}
 
+	public function toArrayOrTraversable(): Type
+	{
+		return new UnionType([
+			new ArrayType($this->keyType, $this->itemType),
+			new GenericObjectType(Traversable::class, [
+				$this->keyType,
+				$this->itemType,
+			]),
+		]);
+	}
+
 	public function toArrayKey(): Type
 	{
 		return new ErrorType();
@@ -247,7 +255,10 @@ public function toCoercedArgumentType(bool $strictTypes): Type
 				),
 				$this->itemType,
 			),
-			$this->toTraversable(),
+			new GenericObjectType(Traversable::class, [
+				$this->keyType,
+				$this->itemType,
+			]),
 		);
 	}
 
@@ -475,12 +486,15 @@ public function tryRemove(Type $typeToRemove): ?Type
 	{
 		$arrayType = new ArrayType(new MixedType(), new MixedType());
 		if ($typeToRemove->isSuperTypeOf($arrayType)->yes()) {
-			return $this->toTraversable();
+			return new GenericObjectType(Traversable::class, [
+				$this->getIterableKeyType(),
+				$this->getIterableValueType(),
+			]);
 		}
 
 		$traversableType = new ObjectType(Traversable::class);
 		if ($typeToRemove->isSuperTypeOf($traversableType)->yes()) {
-			return $this->toArray();
+			return new ArrayType($this->getIterableKeyType(), $this->getIterableValueType());
 		}
 
 		return null;
@@ -528,12 +542,4 @@ 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

@@ -195,10 +195,7 @@ public function getConstantStrings(): array
 	public function accepts(Type $type, bool $strictTypes): AcceptsResult
 	{
 		if ($type instanceof IterableType) {
-			return $this->accepts(new UnionType([
-				$type->toArray(),
-				$type->toTraversable(),
-			]), $strictTypes);
+			return $this->accepts($type->toArrayOrTraversable(), $strictTypes);
 		}
 
 		foreach (self::EQUAL_UNION_CLASSES as $baseClass => $classes) {
@@ -1081,10 +1078,7 @@ public function toCoercedArgumentType(bool $strictTypes): Type
 	public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 	{
 		if ($receivedType instanceof IterableType) {
-			$receivedType = new UnionType([
-				$receivedType->toArray(),
-				$receivedType->toTraversable(),
-			]);
+			$receivedType = $receivedType->toArrayOrTraversable();
 		}
 
 		$types = TemplateTypeMap::createEmpty();