Allow ReflectionClass<covariant X> even on PHP 8.3-

Author: ondrejmirtes

src/Rules/Generics/GenericObjectTypeCheck.php

@@ -16,6 +16,7 @@
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeTraverser;
 use PHPStan\Type\VerbosityLevel;
+use ReflectionClass;
 use function array_filter;
 use function array_keys;
 use function array_values;
@@ -105,17 +106,24 @@ public function check(
 				$genericTypeVariance = $genericTypeVariances[$i] ?? TemplateTypeVariance::createInvariant();
 				if ($templateType instanceof TemplateType && !$genericTypeVariance->invariant()) {
 					if ($genericTypeVariance->equals($templateType->getVariance())) {
-						$messages[] = RuleErrorBuilder::message(sprintf(
-							$typeProjectionIsRedundantMessage,
-							TypeProjectionHelper::describe($genericTypeType, $genericTypeVariance, VerbosityLevel::typeOnly()),
-							$genericType->describe(VerbosityLevel::typeOnly()),
-							$templateType->describe(VerbosityLevel::typeOnly()),
-							$classLikeDescription,
-							$classReflection->getDisplayName(false),
-						))
-							->identifier('generics.callSiteVarianceRedundant')
-							->tip('You can safely remove the call-site variance annotation.')
-							->build();
+						if (
+							// allow ReflectionClass<covariant X>
+							// so that same code works for PHP 8.3 and 8.4+
+							$classReflection->getName() !== ReflectionClass::class
+							|| $templateType->getName() !== 'T'
+						) {
+							$messages[] = RuleErrorBuilder::message(sprintf(
+								$typeProjectionIsRedundantMessage,
+								TypeProjectionHelper::describe($genericTypeType, $genericTypeVariance, VerbosityLevel::typeOnly()),
+								$genericType->describe(VerbosityLevel::typeOnly()),
+								$templateType->describe(VerbosityLevel::typeOnly()),
+								$classLikeDescription,
+								$classReflection->getDisplayName(false),
+							))
+								->identifier('generics.callSiteVarianceRedundant')
+								->tip('You can safely remove the call-site variance annotation.')
+								->build();
+						}
 					} elseif (!$genericTypeVariance->validPosition($templateType->getVariance())) {
 						$messages[] = RuleErrorBuilder::message(sprintf(
 							$typeProjectionHasConflictingVarianceMessage,

tests/PHPStan/Rules/PhpDoc/IncompatiblePhpDocTypeRuleTest.php

@@ -461,4 +461,9 @@ public function testGenericStatic(): void
 		]);
 	}
 
+	public function testBug13452(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-13452.php'], []);
+	}
+
 }

tests/PHPStan/Rules/PhpDoc/data/bug-13452.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Bug13452;
+
+use ReflectionClass;
+
+class Event
+{
+
+}
+
+class HelloWorld
+{
+
+	/**
+	 * @param ReflectionClass<covariant Event> $ref
+	 */
+	public function doFoo(ReflectionClass $ref): void
+	{
+
+	}
+
+}