Report Foo::class of a restricted class with the class name usage message

Since Foo::class is passed to restricted class constant usage extensions
as a constant named "class", the internal class rules reported it as
"Access to constant class of internal class X from outside its root
namespace NS." Report it again as "Access to constant on internal class X."
from the class name usage extension, and use the same wording in
ClassNameUsageLocation for other extensions, such as deprecation rules.

The ClassNameConstantReflection passed to the extensions is unchanged,
so the API extensions still see Foo::class.

Amp-Thread-ID: https://ampcode.com/threads/T-01a19770-5331-74b2-963f-e324ae0f7635

Author: ondrejmirtes

phpstan-baseline.neon

@@ -1784,19 +1784,19 @@ parameters:
 			path: tests/PHPStan/Node/FileNodeTest.php
 
 		-
-			rawMessage: Access to constant class of internal class InternalAnnotations\InternalFoo from outside its root namespace InternalAnnotations.
+			rawMessage: Access to constant on internal class InternalAnnotations\InternalFoo.
 			identifier: classConstant.internalClass
 			count: 1
 			path: tests/PHPStan/Reflection/Annotations/InternalAnnotationsTest.php
 
 		-
-			rawMessage: Access to constant class of internal interface InternalAnnotations\InternalFooInterface from outside its root namespace InternalAnnotations.
+			rawMessage: Access to constant on internal interface InternalAnnotations\InternalFooInterface.
 			identifier: classConstant.internalInterface
 			count: 1
 			path: tests/PHPStan/Reflection/Annotations/InternalAnnotationsTest.php
 
 		-
-			rawMessage: Access to constant class of internal trait InternalAnnotations\InternalFooTrait from outside its root namespace InternalAnnotations.
+			rawMessage: Access to constant on internal trait InternalAnnotations\InternalFooTrait.
 			identifier: classConstant.internalTrait
 			count: 1
 			path: tests/PHPStan/Reflection/Annotations/InternalAnnotationsTest.php
@@ -1820,7 +1820,7 @@ parameters:
 			path: tests/PHPStan/Reflection/SignatureMap/Php8SignatureMapProviderTest.php
 
 		-
-			rawMessage: Access to constant class of internal class PHPUnit\Framework\AssertionFailedError from outside its root namespace PHPUnit.
+			rawMessage: Access to constant on internal class PHPUnit\Framework\AssertionFailedError.
 			identifier: classConstant.internalClass
 			count: 2
 			path: tests/PHPStan/Testing/TypeInferenceTestCaseTest.php

src/Rules/ClassNameUsageLocation.php

@@ -6,6 +6,7 @@
 use PHPStan\Reflection\ExtendedMethodReflection;
 use PHPStan\Reflection\ExtendedPropertyReflection;
 use PHPStan\Reflection\FunctionReflection;
+use PHPStan\Rules\RestrictedUsage\ClassNameConstantReflection;
 use function sprintf;
 use function ucfirst;
 
@@ -153,7 +154,8 @@ public function createMessage(string $part): string
 			case self::EXCEPTION_CATCH:
 				return sprintf('Catching %s.', $part);
 			case self::CLASS_CONSTANT_ACCESS:
-				if ($this->getClassConstant() !== null) {
+				// Foo::class is reported as a usage of the class name, as before it was passed to the extensions
+				if ($this->getClassConstant() !== null && !$this->getClassConstant() instanceof ClassNameConstantReflection) {
 					return sprintf('Access to constant %s on %s.', $this->getClassConstant()->getName(), $part);
 				}
 				return sprintf('Access to constant on %s.', $part);

src/Rules/InternalTag/RestrictedInternalClassConstantUsageExtension.php

@@ -4,6 +4,7 @@
 
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ClassConstantReflection;
+use PHPStan\Rules\RestrictedUsage\ClassNameConstantReflection;
 use PHPStan\Rules\RestrictedUsage\RestrictedClassConstantUsageExtension;
 use PHPStan\Rules\RestrictedUsage\RestrictedUsage;
 use function sprintf;
@@ -21,6 +22,11 @@ public function isRestrictedClassConstantUsage(
 		Scope $scope,
 	): ?RestrictedUsage
 	{
+		// Foo::class is reported as an internal class name usage
+		if ($constantReflection instanceof ClassNameConstantReflection) {
+			return null;
+		}
+
 		$isConstantInternal = $constantReflection->isInternal()->yes();
 		$declaringClass = $constantReflection->getDeclaringClass();
 		$isDeclaringClassInternal = $declaringClass->isInternal();

src/Rules/InternalTag/RestrictedInternalClassNameUsageExtension.php

@@ -5,6 +5,7 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Rules\ClassNameUsageLocation;
+use PHPStan\Rules\RestrictedUsage\ClassNameConstantReflection;
 use PHPStan\Rules\RestrictedUsage\RestrictedClassNameUsageExtension;
 use PHPStan\Rules\RestrictedUsage\RestrictedUsage;
 use function sprintf;
@@ -53,7 +54,7 @@ public function isRestrictedClassNameUsage(
 
 		if ($location->value === ClassNameUsageLocation::CLASS_CONSTANT_ACCESS) {
 			$constant = $location->getClassConstant();
-			if ($constant !== null) {
+			if ($constant !== null && !$constant instanceof ClassNameConstantReflection) {
 				if ($constant->isInternal()->yes() || $constant->getDeclaringClass()->isInternal()) {
 					return null;
 				}

tests/PHPStan/Rules/Classes/ClassConstantRuleTest.php

@@ -638,8 +638,13 @@ public function testClosureAttributeArguments(): void
 
 	public function testInternalClassConstantAccessIsReportedOnce(): void
 	{
-		// reported by RestrictedClassConstantUsageRule, including Foo::class
-		$this->analyse([__DIR__ . '/../InternalTag/data/class-constant-internal-tag.php'], []);
+		// constants are reported by RestrictedClassConstantUsageRule, Foo::class as an internal class name usage here
+		$this->analyse([__DIR__ . '/../InternalTag/data/class-constant-internal-tag.php'], [
+			[
+				'Access to constant on internal class ClassConstantInternalTagOne\\FooInternal.',
+				115,
+			],
+		]);
 	}
 
 }

tests/PHPStan/Rules/InternalTag/RestrictedInternalClassConstantUsageExtensionTest.php

@@ -53,10 +53,6 @@ public function testRule(): void
 				'Access to constant FOO of internal class FooInternalWithClassConstantWithoutNamespace.',
 				107,
 			],
-			[
-				'Access to constant class of internal class ClassConstantInternalTagOne\\FooInternal from outside its root namespace ClassConstantInternalTagOne.',
-				115,
-			],
 		]);
 	}