Fix assertSuperType logic

Author: vojtech-dobes

src/Testing/TypeInferenceTestCase.php

@@ -17,6 +17,7 @@
 use PHPStan\Php\PhpVersion;
 use PHPStan\PhpDoc\PhpDocInheritanceResolver;
 use PHPStan\PhpDoc\StubPhpDocProvider;
+use PHPStan\PhpDoc\TypeStringResolver;
 use PHPStan\Reflection\AttributeReflectionFactory;
 use PHPStan\Reflection\Deprecation\DeprecationProvider;
 use PHPStan\Reflection\InitializerExprTypeResolver;
@@ -28,6 +29,7 @@
 use PHPStan\Type\ConstantScalarType;
 use PHPStan\Type\FileTypeMapper;
 use PHPStan\Type\Type;
+use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\VerbosityLevel;
 use Symfony\Component\Finder\Finder;
 use function array_map;
@@ -203,12 +205,13 @@ public static function gatherAssertTypes(string $file): array
 
 		$relativePathHelper = new SystemAgnosticSimpleRelativePathHelper($fileHelper);
 		$reflectionProvider = self::getContainer()->getByType(ReflectionProvider::class);
+		$typeStringResolver = self::getContainer()->getByType(TypeStringResolver::class);
 
 		$file = $fileHelper->normalizePath($file);
 
 		$asserts = [];
 		$delayedErrors = [];
-		self::processFile($file, static function (Node $node, Scope $scope) use (&$asserts, &$delayedErrors, $file, $relativePathHelper, $reflectionProvider): void {
+		self::processFile($file, static function (Node $node, Scope $scope) use (&$asserts, &$delayedErrors, $file, $relativePathHelper, $reflectionProvider, $typeStringResolver): void {
 			if ($node instanceof InClassNode) {
 				if (!$reflectionProvider->hasClass($node->getClassReflection()->getName())) {
 					$delayedErrors[] = sprintf(
@@ -278,8 +281,16 @@ public static function gatherAssertTypes(string $file): array
 						$node->getStartLine(),
 					));
 				}
+
 				$actualType = $scope->getType($node->getArgs()[1]->value);
-				$assert = ['superType', $file, $expectedType->getValue(), $actualType->describe(VerbosityLevel::precise()), $expectedType->isSuperTypeOf($actualType)->yes(), $node->getStartLine()];
+				$isCorrect = TypeCombinator::union(
+					...array_map(
+						fn ($expectedTypeString) => $typeStringResolver->resolve($expectedTypeString->getValue()),
+						$expectedType->getConstantStrings(),
+					),
+				)->isSuperTypeOf($actualType)->yes();
+
+				$assert = ['superType', $file, $expectedType->getValue(), $actualType->describe(VerbosityLevel::precise()), $isCorrect, $node->getStartLine()];
 			} elseif ($functionName === 'PHPStan\\Testing\\assertVariableCertainty') {
 				$certainty = $node->getArgs()[0]->value;
 				if (!$certainty instanceof StaticCall) {