Fix assertSuperType logic

Author: vojtech-dobes

phpstan-baseline.neon

@@ -780,7 +780,7 @@ parameters:
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\ConstantScalarType is error\-prone and deprecated\. Use Type\:\:isConstantScalarValue\(\) or Type\:\:getConstantScalarTypes\(\) or Type\:\:getConstantScalarValues\(\) instead\.$#'
 			identifier: phpstanApi.instanceofType
-			count: 3
+			count: 2
 			path: src/Testing/TypeInferenceTestCase.php
 
 		-

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;
@@ -203,12 +204,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(
@@ -270,16 +272,20 @@ public static function gatherAssertTypes(string $file): array
 				$assert = ['type', $file, $expectedType->getValue(), $actualType->describe(VerbosityLevel::precise()), $node->getStartLine()];
 			} elseif ($functionName === 'PHPStan\\Testing\\assertSuperType') {
 				$expectedType = $scope->getType($node->getArgs()[0]->value);
-				if (!$expectedType instanceof ConstantScalarType) {
+				$expectedTypeStrings = $expectedType->getConstantStrings();
+				if (count($expectedTypeStrings) !== 1) {
 					self::fail(sprintf(
 						'Expected super type must be a literal string, %s given in %s on line %d.',
 						$expectedType->describe(VerbosityLevel::precise()),
 						$relativePathHelper->getRelativePath($file),
 						$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 = $typeStringResolver->resolve($expectedTypeStrings[0]->getValue())->isSuperTypeOf($actualType)->yes();
+
+				$assert = ['superType', $file, $expectedTypeStrings[0]->getValue(), $actualType->describe(VerbosityLevel::precise()), $isCorrect, $node->getStartLine()];
 			} elseif ($functionName === 'PHPStan\\Testing\\assertVariableCertainty') {
 				$certainty = $node->getArgs()[0]->value;
 				if (!$certainty instanceof StaticCall) {

tests/PHPStan/Testing/TypeInferenceTestCaseTest.php

@@ -121,6 +121,25 @@ public function testVariableOrOffsetDescription(): void
 		$this->assertSame("offset 'email'", $offsetAssert[4]);
 	}
 
+	public function testSuperType(): void
+	{
+		foreach (self::gatherAssertTypes(__DIR__ . '/data/assert-super-type.php') as $data) {
+			$this->assertFileAsserts(...$data);
+		}
+	}
+
+	public static function dataSuperTypeFailed(): array
+	{
+		return self::gatherAssertTypes(__DIR__ . '/data/assert-super-type-failed.php');
+	}
+
+	#[DataProvider('dataSuperTypeFailed')]
+	public function testSuperTypeFailed(...$data): void
+	{
+		$this->expectException(AssertionFailedError::class);
+		$this->assertFileAsserts(...$data);
+	}
+
 	public function testNonexistentClassInAnalysedFile(): void
 	{
 		foreach (self::gatherAssertTypes(__DIR__ . '/../../notAutoloaded/nonexistentClasses.php') as $data) {

tests/PHPStan/Testing/data/assert-super-type-failed.php

@@ -0,0 +1,9 @@
+<?php
+
+use function PHPStan\Testing\assertSuperType;
+
+$a = 'Alice';
+
+assertSuperType('never', $a);
+assertSuperType('bool', $a);
+assertSuperType('"Bob"', $a);

tests/PHPStan/Testing/data/assert-super-type.php

@@ -0,0 +1,8 @@
+<?php
+
+use function PHPStan\Testing\assertSuperType;
+
+$a = 'Alice';
+
+assertSuperType('string', $a);
+assertSuperType('mixed', $a);