Fix infinite recursion when asking isSuperTypeOf() between template u…

…nion types
phpstan · Mar 7, 2021 · 9f51f8e · 9f51f8e
1 parent bf0ba16
commit 9f51f8e
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 1 deletion.
diff --git a/src/Type/Generic/TemplateTypeTrait.php b/src/Type/Generic/TemplateTypeTrait.php
@@ -118,7 +118,11 @@ public function isSuperTypeOf(Type $type): TrinaryLogic
 	public function isSubTypeOf(Type $type): TrinaryLogic
 	{
 		$boundClass = get_class($this->getBound());
-		if (!$type instanceof $boundClass && ($type instanceof UnionType || $type instanceof IntersectionType)) {
+		if (
+			!$type instanceof $boundClass
+			&& !$type instanceof TemplateType
+			&& ($type instanceof UnionType || $type instanceof IntersectionType)
+		) {
 			return $type->isSuperTypeOf($this);
 		}
 

diff --git a/tests/PHPStan/Type/TemplateTypeTest.php b/tests/PHPStan/Type/TemplateTypeTest.php
@@ -206,6 +206,48 @@ public function dataIsSuperTypeOf(): array
 				TrinaryLogic::createMaybe(),
 				TrinaryLogic::createMaybe(),
 			],
+			[
+				$templateType('T', new MixedType(true)),
+				$templateType('U', new UnionType([new IntegerType(), new StringType()])),
+				TrinaryLogic::createMaybe(),
+				TrinaryLogic::createMaybe(),
+			],
+			[
+				$templateType('T', new MixedType(true)),
+				$templateType('U', new BenevolentUnionType([new IntegerType(), new StringType()])),
+				TrinaryLogic::createMaybe(),
+				TrinaryLogic::createMaybe(),
+			],
+			[
+				$templateType('T', new ObjectType(\stdClass::class)),
+				$templateType('U', new BenevolentUnionType([new IntegerType(), new StringType()])),
+				TrinaryLogic::createNo(),
+				TrinaryLogic::createNo(),
+			],
+			[
+				$templateType('T', new BenevolentUnionType([new IntegerType(), new StringType()])),
+				$templateType('T', new BenevolentUnionType([new IntegerType(), new StringType()])),
+				TrinaryLogic::createYes(),
+				TrinaryLogic::createYes(),
+			],
+			[
+				$templateType('T', new UnionType([new IntegerType(), new StringType()])),
+				$templateType('T', new UnionType([new IntegerType(), new StringType()])),
+				TrinaryLogic::createYes(),
+				TrinaryLogic::createYes(),
+			],
+			[
+				$templateType('T', new UnionType([new IntegerType(), new StringType()])),
+				$templateType('T', new BenevolentUnionType([new IntegerType(), new StringType()])),
+				TrinaryLogic::createMaybe(),
+				TrinaryLogic::createMaybe(),
+			],
+			[
+				$templateType('T', new UnionType([new IntegerType(), new StringType()])),
+				$templateType('T', new IntegerType()),
+				TrinaryLogic::createMaybe(),
+				TrinaryLogic::createMaybe(),
+			],
 		];
 	}