GenericClassStringType::isSuperTypeOf() - do not convert maybe into no

phpstan · Jul 12, 2022 · 6fba542 · 6fba542
1 parent 0e25706
commit 6fba542
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/src/Type/Generic/GenericClassStringType.php b/src/Type/Generic/GenericClassStringType.php
@@ -96,10 +96,6 @@ public function isSuperTypeOf(Type $type): TrinaryLogic
 				$isSuperType = $genericType->isSuperTypeOf($objectType);
 			}
 
-			// Explicitly handle the uncertainty for Maybe.
-			if ($isSuperType->maybe()) {
-				return TrinaryLogic::createNo();
-			}
 			return $isSuperType;
 		} elseif ($type instanceof self) {
 			return $this->type->isSuperTypeOf($type->type);

diff --git a/tests/PHPStan/Type/Generic/GenericClassStringTypeTest.php b/tests/PHPStan/Type/Generic/GenericClassStringTypeTest.php
@@ -73,7 +73,7 @@ public function dataIsSuperTypeOf(): array
 			8 => [
 				new GenericClassStringType(new ObjectType(InvalidArgumentException::class)),
 				new ConstantStringType(Exception::class),
-				TrinaryLogic::createNo(),
+				TrinaryLogic::createMaybe(),
 			],
 			9 => [
 				new GenericClassStringType(new ObjectType(stdClass::class)),
@@ -128,7 +128,7 @@ public function dataIsSuperTypeOf(): array
 					TemplateTypeVariance::createInvariant(),
 				)),
 				new ConstantStringType(Throwable::class),
-				TrinaryLogic::createNo(),
+				TrinaryLogic::createMaybe(),
 			],
 			15 => [
 				new GenericClassStringType(new StaticType($reflectionProvider->getClass(Exception::class))),
@@ -138,7 +138,7 @@ public function dataIsSuperTypeOf(): array
 			16 => [
 				new GenericClassStringType(new StaticType($reflectionProvider->getClass(InvalidArgumentException::class))),
 				new ConstantStringType(Exception::class),
-				TrinaryLogic::createNo(),
+				TrinaryLogic::createMaybe(),
 			],
 			17 => [
 				new GenericClassStringType(new StaticType($reflectionProvider->getClass(Throwable::class))),

diff --git a/tests/PHPStan/Type/TypeCombinatorTest.php b/tests/PHPStan/Type/TypeCombinatorTest.php
@@ -3020,8 +3020,8 @@ public function dataIntersect(): iterable
 					new GenericClassStringType(new ObjectType(InvalidArgumentException::class)),
 					new ConstantStringType(Exception::class),
 				],
-				NeverType::class,
-				'*NEVER*',
+				IntersectionType::class,
+				"'Exception'&class-string<InvalidArgumentException>",
 			],
 			[
 				[