Fix unions of TemplateType child classes

Author: ondrejmirtes

src/Type/Generic/TemplateMixedType.php

@@ -101,6 +101,11 @@ public function isSuperTypeOf(Type $type): TrinaryLogic
 			->and(TrinaryLogic::createMaybe());
 	}
 
+	public function isSuperTypeOfMixed(MixedType $type): TrinaryLogic
+	{
+		return $this->isSuperTypeOf($type);
+	}
+
 	public function isSubTypeOf(Type $type): TrinaryLogic
 	{
 		if ($type instanceof UnionType || $type instanceof IntersectionType) {

src/Type/Generic/TemplateObjectWithoutClassType.php

@@ -169,7 +169,7 @@ public function isSubTypeOf(Type $type): TrinaryLogic
 			return $type->isSuperTypeOf($this);
 		}
 
-		if ($type instanceof ObjectWithoutClassType) {
+		if ($type instanceof ObjectWithoutClassType && !$type instanceof self) {
 			return TrinaryLogic::createYes();
 		}
 

tests/PHPStan/Rules/Generators/data/yield.php

@@ -90,4 +90,32 @@ function iterator_map(iterable $iterator, callable $callback): iterable
 		}
 	}
 
+	/**
+	 * @template T
+	 * @template K
+	 * @param iterable<K, T> $hash
+	 * @return \Generator<int, K|T, void, void>
+	 */
+	function hash_to_alt_sequence(iterable $hash): iterable
+	{
+		foreach ($hash as $k => $v) {
+			yield $k;
+			yield $v;
+		}
+	}
+
+	/**
+	 * @template T
+	 * @template K
+	 * @param iterable<K, T> $hash
+	 * @return iterable<int, K|T>
+	 */
+	function hash_to_alt_sequence2(iterable $hash): iterable
+	{
+		foreach ($hash as $k => $v) {
+			yield $k;
+			yield $v;
+		}
+	}
+
 }

tests/PHPStan/Type/Generic/GenericClassStringTypeTest.php

@@ -234,7 +234,7 @@ public function dataAccepts(): array
 					new ObjectWithoutClassType(),
 					TemplateTypeVariance::createInvariant()
 				)),
-				TrinaryLogic::createYes(),
+				TrinaryLogic::createMaybe(),
 			],
 		];
 	}

tests/PHPStan/Type/TypeCombinatorTest.php

@@ -1497,6 +1497,60 @@ public function dataUnion(): array
 				MixedType::class,
 				'mixed=implicit',
 			],
+			[
+				[
+					TemplateTypeFactory::create(
+						TemplateTypeScope::createWithFunction('a'),
+						'T',
+						null,
+						TemplateTypeVariance::createInvariant()
+					),
+					TemplateTypeFactory::create(
+						TemplateTypeScope::createWithFunction('a'),
+						'K',
+						null,
+						TemplateTypeVariance::createInvariant()
+					),
+				],
+				UnionType::class,
+				'K (function a(), parameter)|T (function a(), parameter)',
+			],
+			[
+				[
+					TemplateTypeFactory::create(
+						TemplateTypeScope::createWithFunction('a'),
+						'T',
+						new ObjectWithoutClassType(),
+						TemplateTypeVariance::createInvariant()
+					),
+					TemplateTypeFactory::create(
+						TemplateTypeScope::createWithFunction('a'),
+						'K',
+						new ObjectWithoutClassType(),
+						TemplateTypeVariance::createInvariant()
+					),
+				],
+				UnionType::class,
+				'K of object (function a(), parameter)|T of object (function a(), parameter)',
+			],
+			[
+				[
+					TemplateTypeFactory::create(
+						TemplateTypeScope::createWithFunction('a'),
+						'T',
+						new ObjectType(\Exception::class),
+						TemplateTypeVariance::createInvariant()
+					),
+					TemplateTypeFactory::create(
+						TemplateTypeScope::createWithFunction('a'),
+						'K',
+						new ObjectType(\stdClass::class),
+						TemplateTypeVariance::createInvariant()
+					),
+				],
+				UnionType::class,
+				'K of stdClass (function a(), parameter)|T of Exception (function a(), parameter)',
+			],
 		];
 	}