Rework

Author: VincentLanglet

src/Rules/PhpDoc/RequireExtendsCheck.php

@@ -7,14 +7,13 @@
 use PHPStan\DependencyInjection\AutowiredParameter;
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\PhpDoc\Tag\RequireExtendsTag;
+use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\ClassNameCheck;
 use PHPStan\Rules\ClassNameNodePair;
 use PHPStan\Rules\ClassNameUsageLocation;
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\VerbosityLevel;
-use function array_column;
-use function array_map;
 use function array_merge;
 use function count;
 use function sort;
@@ -26,6 +25,7 @@ final class RequireExtendsCheck
 {
 
 	public function __construct(
+		private ReflectionProvider $reflectionProvider,
 		private ClassNameCheck $classCheck,
 		#[AutowiredParameter]
 		private bool $checkClassCaseSensitivity,
@@ -59,12 +59,8 @@ public function checkExtendsTags(Scope $scope, Node $node, array $extendsTags):
 				continue;
 			}
 
-			sort($classNames);
-			$referencedClassReflections = array_map(static fn ($reflection) => [$reflection, $reflection->getName()], $type->getObjectClassReflections());
-			$referencedClassReflectionsMap = array_column($referencedClassReflections, 0, 1);
 			foreach ($classNames as $class) {
-				$referencedClassReflection = $referencedClassReflectionsMap[$class] ?? null;
-				if ($referencedClassReflection === null) {
+				if (!$this->reflectionProvider->hasClass($class)) {
 					$errorBuilder = RuleErrorBuilder::message(sprintf('PHPDoc tag @phpstan-require-extends contains unknown class %s.', $class))
 						->identifier('class.notFound');
 
@@ -76,16 +72,17 @@ public function checkExtendsTags(Scope $scope, Node $node, array $extendsTags):
 					continue;
 				}
 
-				if ($referencedClassReflection->isInterface()) {
+				$reflection = $this->reflectionProvider->getClass($class);
+				if ($reflection->isInterface()) {
 					$errors[] = RuleErrorBuilder::message(sprintf('PHPDoc tag @phpstan-require-extends cannot contain an interface %s, expected a class.', $class))
 						->tip('If you meant an interface, use @phpstan-require-implements instead.')
 						->identifier('requireExtends.interface')
 						->build();
-				} elseif (!$referencedClassReflection->isClass()) {
+				} elseif (!$reflection->isClass()) {
 					$errors[] = RuleErrorBuilder::message(sprintf('PHPDoc tag @phpstan-require-extends cannot contain non-class type %s.', $class))
-						->identifier(sprintf('requireExtends.%s', strtolower($referencedClassReflection->getClassTypeDescription())))
+						->identifier(sprintf('requireExtends.%s', strtolower($reflection->getClassTypeDescription())))
 						->build();
-				} elseif ($referencedClassReflection->isFinal()) {
+				} elseif ($reflection->isFinal()) {
 					$errors[] = RuleErrorBuilder::message(sprintf('PHPDoc tag @phpstan-require-extends cannot contain final class %s.', $class))
 						->identifier('requireExtends.finalClass')
 						->build();

src/Rules/PhpDoc/RequireImplementsDefinitionTraitRule.php

@@ -66,11 +66,8 @@ public function processNode(Node $node, Scope $scope): array
 				continue;
 			}
 
-			$referencedClassReflections = array_map(static fn ($reflection) => [$reflection, $reflection->getName()], $type->getObjectClassReflections());
-			$referencedClassReflectionsMap = array_column($referencedClassReflections, 0, 1);
 			foreach ($classNames as $class) {
-				$referencedClassReflection = $referencedClassReflectionsMap[$class] ?? null;
-				if ($referencedClassReflection === null) {
+				if (!$this->reflectionProvider->hasClass($class)) {
 					$errorBuilder = RuleErrorBuilder::message(sprintf('PHPDoc tag @phpstan-require-implements contains unknown class %s.', $class))
 					->identifier('class.notFound');
 
@@ -82,9 +79,10 @@ public function processNode(Node $node, Scope $scope): array
 					continue;
 				}
 
-				if (!$referencedClassReflection->isInterface()) {
+				$reflection = $this->reflectionProvider->getClass($class);
+				if (!$reflection->isInterface()) {
 					$errors[] = RuleErrorBuilder::message(sprintf('PHPDoc tag @phpstan-require-implements cannot contain non-interface type %s.', $class))
-						->identifier(sprintf('requireImplements.%s', strtolower($referencedClassReflection->getClassTypeDescription())))
+						->identifier(sprintf('requireImplements.%s', strtolower($reflection->getClassTypeDescription())))
 						->build();
 				} else {
 					$errors = array_merge(

src/Rules/PhpDoc/SealedDefinitionClassRule.php

@@ -7,6 +7,7 @@
 use PHPStan\DependencyInjection\AutowiredParameter;
 use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Node\InClassNode;
+use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\ClassNameCheck;
 use PHPStan\Rules\ClassNameNodePair;
 use PHPStan\Rules\ClassNameUsageLocation;
@@ -27,6 +28,7 @@ final class SealedDefinitionClassRule implements Rule
 {
 
 	public function __construct(
+		private ReflectionProvider $reflectionProvider,
 		private ClassNameCheck $classCheck,
 		#[AutowiredParameter]
 		private bool $checkClassCaseSensitivity,
@@ -69,11 +71,8 @@ public function processNode(Node $node, Scope $scope): array
 				continue;
 			}
 
-			$referencedClassReflections = array_map(static fn ($reflection) => [$reflection, $reflection->getName()], $type->getObjectClassReflections());
-			$referencedClassReflectionsMap = array_column($referencedClassReflections, 0, 1);
 			foreach ($classNames as $class) {
-				$referencedClassReflection = $referencedClassReflectionsMap[$class] ?? null;
-				if ($referencedClassReflection === null) {
+				if (!$this->reflectionProvider->hasClass($class)) {
 					$errorBuilder = RuleErrorBuilder::message(sprintf('PHPDoc tag @phpstan-sealed contains unknown class %s.', $class))
 					->identifier('class.notFound');
 

src/Type/UnionType.php

@@ -162,14 +162,10 @@ public function getObjectClassNames(): array
 
 	public function getObjectClassReflections(): array
 	{
-		$reflections = [];
-		foreach ($this->types as $type) {
-			foreach ($type->getObjectClassReflections() as $reflection) {
-				$reflections[] = $reflection;
-			}
-		}
-
-		return $reflections;
+		return $this->pickFromTypes(
+			static fn (Type $type) => $type->getObjectClassReflections(),
+			static fn (Type $type) => $type->isObject()->yes(),
+		);
 	}
 
 	public function getArrays(): array

tests/PHPStan/Rules/PhpDoc/RequireExtendsDefinitionClassRuleTest.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\PhpDoc;
 
+use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\ClassCaseSensitivityCheck;
 use PHPStan\Rules\ClassForbiddenNameCheck;
 use PHPStan\Rules\ClassNameCheck;
@@ -22,6 +23,7 @@ protected function getRule(): Rule
 		$container = self::getContainer();
 		return new RequireExtendsDefinitionClassRule(
 			new RequireExtendsCheck(
+				$reflectionProvider,
 				new ClassNameCheck(
 					new ClassCaseSensitivityCheck($reflectionProvider, true),
 					new ClassForbiddenNameCheck($container),