[BCB] TypehintHelper::decideTypeFromReflection() parameter $selfClass no longer accepts string

Author: ondrejmirtes

UPGRADING.md

@@ -281,3 +281,4 @@ Instead of `PHPStanTestCase::createBroker()`, call `PHPStanTestCase::createRefle
 * [`Type::getProperty()`](https://apiref.phpstan.org/2.0.x/PHPStan.Type.Type.html#_getProperty) now returns [`ExtendedPropertyReflection`](https://apiref.phpstan.org/2.0.x/PHPStan.Reflection.ExtendedPropertyReflection.html)
 * `additionalConfigFiles` config parameter must be a list
 * Remove `__set_state()` on objects that should not be serialized in cache
+* Parameter `$selfClass` of [`TypehintHelper::decideTypeFromReflection()`](https://apiref.phpstan.org/2.0.x/PHPStan.Type.TypehintHelper.html#_decideTypeFromReflection) no longer accepts string

src/Reflection/Php/PhpMethodReflection.php

@@ -232,7 +232,7 @@ private function getParameters(): array
 				$this->initializerExprTypeResolver,
 				$reflection,
 				$this->phpDocParameterTypes[$reflection->getName()] ?? null,
-				$this->getDeclaringClass()->getName(),
+				$this->getDeclaringClass(),
 				$this->phpDocParameterOutTypes[$reflection->getName()] ?? null,
 				$this->immediatelyInvokedCallableParameters[$reflection->getName()] ?? TrinaryLogic::createMaybe(),
 				$this->phpDocClosureThisTypeParameters[$reflection->getName()] ?? null,

src/Reflection/Php/PhpParameterReflection.php

@@ -3,6 +3,7 @@
 namespace PHPStan\Reflection\Php;
 
 use PHPStan\BetterReflection\Reflection\Adapter\ReflectionParameter;
+use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\InitializerExprContext;
 use PHPStan\Reflection\InitializerExprTypeResolver;
 use PHPStan\Reflection\ParameterReflectionWithPhpDocs;
@@ -24,7 +25,7 @@ public function __construct(
 		private InitializerExprTypeResolver $initializerExprTypeResolver,
 		private ReflectionParameter $reflection,
 		private ?Type $phpDocType,
-		private ?string $declaringClassName,
+		private ?ClassReflection $declaringClass,
 		private ?Type $outType,
 		private TrinaryLogic $immediatelyInvokedCallable,
 		private ?Type $closureThisType,
@@ -62,7 +63,7 @@ public function getType(): Type
 			$this->type = TypehintHelper::decideTypeFromReflection(
 				$this->reflection->getType(),
 				$phpDocType,
-				$this->declaringClassName,
+				$this->declaringClass,
 				$this->isVariadic(),
 			);
 		}
@@ -97,7 +98,7 @@ public function getNativeType(): Type
 			$this->nativeType = TypehintHelper::decideTypeFromReflection(
 				$this->reflection->getType(),
 				null,
-				$this->declaringClassName,
+				$this->declaringClass,
 				$this->isVariadic(),
 			);
 		}

src/Rules/Traits/ConflictingTraitConstantsRule.php

@@ -8,6 +8,7 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\InitializerExprContext;
 use PHPStan\Reflection\InitializerExprTypeResolver;
+use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -22,7 +23,10 @@
 final class ConflictingTraitConstantsRule implements Rule
 {
 
-	public function __construct(private InitializerExprTypeResolver $initializerExprTypeResolver)
+	public function __construct(
+		private InitializerExprTypeResolver $initializerExprTypeResolver,
+		private ReflectionProvider $reflectionProvider,
+	)
 	{
 	}
 
@@ -186,7 +190,7 @@ private function processSingleConstant(ClassReflection $classReflection, Reflect
 					->build();
 			}
 		} elseif ($constantNativeType === null) {
-			$traitNativeTypeType = TypehintHelper::decideTypeFromReflection($traitNativeType, null, $traitDeclaringClass->getName());
+			$traitNativeTypeType = TypehintHelper::decideTypeFromReflection($traitNativeType, null, $this->reflectionProvider->getClass($traitDeclaringClass->getName()));
 			$errors[] = RuleErrorBuilder::message(sprintf(
 				'Constant %s::%s overriding constant %s::%s (%s) should also have native type %s.',
 				$classReflection->getDisplayName(),
@@ -200,7 +204,7 @@ private function processSingleConstant(ClassReflection $classReflection, Reflect
 				->identifier('classConstant.missingNativeType')
 				->build();
 		} else {
-			$traitNativeTypeType = TypehintHelper::decideTypeFromReflection($traitNativeType, null, $traitDeclaringClass->getName());
+			$traitNativeTypeType = TypehintHelper::decideTypeFromReflection($traitNativeType, null, $this->reflectionProvider->getClass($traitDeclaringClass->getName()));
 			$constantNativeTypeType = ParserNodeTypeToPHPStanType::resolve($constantNativeType, $classReflection);
 			if (!$traitNativeTypeType->equals($constantNativeTypeType)) {
 				$errors[] = RuleErrorBuilder::message(sprintf(

src/Type/TypehintHelper.php

@@ -8,15 +8,13 @@
 use PHPStan\BetterReflection\Reflection\Adapter\ReflectionNamedType;
 use PHPStan\BetterReflection\Reflection\Adapter\ReflectionUnionType;
 use PHPStan\Reflection\ClassReflection;
-use PHPStan\Reflection\ReflectionProviderStaticAccessor;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Generic\TemplateTypeHelper;
 use ReflectionType;
 use function array_map;
 use function count;
 use function get_class;
-use function is_string;
 use function sprintf;
 
 final class TypehintHelper
@@ -26,7 +24,7 @@ final class TypehintHelper
 	public static function decideTypeFromReflection(
 		?ReflectionType $reflectionType,
 		?Type $phpDocType = null,
-		ClassReflection|string|null $selfClass = null,
+		ClassReflection|null $selfClass = null,
 		bool $isVariadic = false,
 	): Type
 	{
@@ -67,14 +65,6 @@ public static function decideTypeFromReflection(
 			$typeNode = new FullyQualified($reflectionType->getName());
 		}
 
-		if (is_string($selfClass)) {
-			$reflectionProvider = ReflectionProviderStaticAccessor::getInstance();
-			if ($reflectionProvider->hasClass($selfClass)) {
-				$selfClass = $reflectionProvider->getClass($selfClass);
-			} else {
-				$selfClass = null;
-			}
-		}
 		$type = ParserNodeTypeToPHPStanType::resolve($typeNode, $selfClass);
 		if ($reflectionType->allowsNull()) {
 			$type = TypeCombinator::addNull($type);

tests/PHPStan/Rules/Traits/ConflictingTraitConstantsRuleTest.php

@@ -14,7 +14,7 @@ class ConflictingTraitConstantsRuleTest extends RuleTestCase
 
 	protected function getRule(): TRule
 	{
-		return new ConflictingTraitConstantsRule(self::getContainer()->getByType(InitializerExprTypeResolver::class));
+		return new ConflictingTraitConstantsRule(self::getContainer()->getByType(InitializerExprTypeResolver::class), $this->createReflectionProvider());
 	}
 
 	public function testRule(): void