Rework

Author: VincentLanglet

src/Rules/PhpDoc/RequireExtendsCheck.php

@@ -12,7 +12,6 @@
 use PHPStan\Rules\ClassNameUsageLocation;
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
 use function array_column;
 use function array_map;
@@ -60,18 +59,8 @@ public function checkExtendsTags(Scope $scope, Node $node, array $extendsTags):
 				continue;
 			}
 
-			if ($type instanceof UnionType) {
-				$classReflections = [];
-				foreach ($type->getTypes() as $subType) {
-					$classReflections[] = $subType->getObjectClassReflections();
-				}
-				$classReflections = array_merge(...$classReflections);
-			} else {
-				$classReflections = $type->getObjectClassReflections();
-			}
-
 			sort($classNames);
-			$referencedClassReflections = array_map(static fn ($reflection) => [$reflection, $reflection->getName()], $classReflections);
+			$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;

src/Rules/PhpDoc/RequireImplementsDefinitionTraitRule.php

@@ -12,7 +12,6 @@
 use PHPStan\Rules\ClassNameUsageLocation;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
 use function array_column;
 use function array_map;
@@ -67,17 +66,7 @@ public function processNode(Node $node, Scope $scope): array
 				continue;
 			}
 
-			if ($type instanceof UnionType) {
-				$classReflections = [];
-				foreach ($type->getTypes() as $subType) {
-					$classReflections[] = $subType->getObjectClassReflections();
-				}
-				$classReflections = array_merge(...$classReflections);
-			} else {
-				$classReflections = $type->getObjectClassReflections();
-			}
-
-			$referencedClassReflections = array_map(static fn ($reflection) => [$reflection, $reflection->getName()], $classReflections);
+			$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;

src/Rules/PhpDoc/SealedDefinitionClassRule.php

@@ -12,7 +12,6 @@
 use PHPStan\Rules\ClassNameUsageLocation;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
 use function array_column;
 use function array_map;
@@ -70,17 +69,7 @@ public function processNode(Node $node, Scope $scope): array
 				continue;
 			}
 
-			if ($type instanceof UnionType) {
-				$classReflections = [];
-				foreach ($type->getTypes() as $subType) {
-					$classReflections[] = $subType->getObjectClassReflections();
-				}
-				$classReflections = array_merge(...$classReflections);
-			} else {
-				$classReflections = $type->getObjectClassReflections();
-			}
-
-			$referencedClassReflections = array_map(static fn ($reflection) => [$reflection, $reflection->getName()], $classReflections);
+			$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;

src/Type/UnionType.php

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

tests/PHPStan/Rules/PhpDoc/RequireExtendsDefinitionClassRuleTest.php

@@ -85,11 +85,6 @@ public function testRule(): void
 				183,
 				'Learn more at https://phpstan.org/user-guide/discovering-symbols',
 			],
-			[
-				'PHPDoc tag @phpstan-require-extends contains unknown class IncompatibleRequireExtends\SomeClass.',
-				183,
-				'Learn more at https://phpstan.org/user-guide/discovering-symbols',
-			],
 		]);
 	}
 

tests/PHPStan/Rules/PhpDoc/RequireExtendsDefinitionTraitRuleTest.php

@@ -55,11 +55,6 @@ public function testRule(): void
 				192,
 				'Learn more at https://phpstan.org/user-guide/discovering-symbols',
 			],
-			[
-				'PHPDoc tag @phpstan-require-extends contains unknown class IncompatibleRequireExtends\SomeClass.',
-				192,
-				'Learn more at https://phpstan.org/user-guide/discovering-symbols',
-			],
 		]);
 	}