Fix regression

phpstan · Feb 4, 2022 · 705b460 · 705b460
1 parent 9512513
commit 705b460
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 0 deletions.
diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
@@ -101,6 +101,10 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 			$results[] = $innerType->accepts($type, $strictTypes);
 		}
 
+		if ($type instanceof TemplateUnionType) {
+			$results[] = $type->isAcceptedBy($this, $strictTypes);
+		}
+
 		return TrinaryLogic::createNo()->or(...$results);
 	}
 
@@ -118,6 +122,10 @@ public function isSuperTypeOf(Type $otherType): TrinaryLogic
 			$results[] = $innerType->isSuperTypeOf($otherType);
 		}
 
+		if ($otherType instanceof TemplateUnionType) {
+			$results[] = $otherType->isSubTypeOf($this);
+		}
+
 		return TrinaryLogic::createNo()->or(...$results);
 	}
 

diff --git a/tests/PHPStan/Type/UnionTypeTest.php b/tests/PHPStan/Type/UnionTypeTest.php
@@ -345,6 +345,23 @@ public function dataIsSuperTypeOf(): Iterator
 			TrinaryLogic::createNo(),
 		];
 
+		yield 'is super type of template-of-union with same members' => [
+			new UnionType([
+				new IntegerType(),
+				new FloatType(),
+			]),
+			TemplateTypeFactory::create(
+				TemplateTypeScope::createWithClass('Foo'),
+				'T',
+				new UnionType([
+					new IntegerType(),
+					new FloatType(),
+				]),
+				TemplateTypeVariance::createInvariant(),
+			),
+			TrinaryLogic::createYes(),
+		];
+
 		yield 'is super type of template-of-union equal to a union member' => [
 			new UnionType([
 				TemplateTypeFactory::create(
@@ -862,6 +879,22 @@ public function dataAccepts(): array
 				new ClosureType([], new MixedType(), false),
 				TrinaryLogic::createYes(),
 			],
+			'accepts template-of-union with same members' => [
+				new UnionType([
+					new IntegerType(),
+					new FloatType(),
+				]),
+				TemplateTypeFactory::create(
+					TemplateTypeScope::createWithClass('Foo'),
+					'T',
+					new UnionType([
+						new IntegerType(),
+						new FloatType(),
+					]),
+					TemplateTypeVariance::createInvariant(),
+				),
+				TrinaryLogic::createYes(),
+			],
 			'accepts template-of-union equal to a union member' => [
 				new UnionType([
 					TemplateTypeFactory::create(