Fix ::class on string expression

phpstan · Sep 2, 2022 · bb30737 · bb30737
1 parent c057aa9
commit bb30737
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/src/Reflection/InitializerExprTypeResolver.php b/src/Reflection/InitializerExprTypeResolver.php
@@ -1700,6 +1700,8 @@ public function getClassConstFetchTypeByReflection(Name|Expr $class, string $con
 			if (strtolower($constantName) === 'class') {
 				return new ConstantStringType($constantClassType->getClassName(), true);
 			}
+		} elseif ($class instanceof String_ && strtolower($constantName) === 'class') {
+			return new ConstantStringType($class->value, true);
 		} else {
 			$constantClassType = $getTypeCallback($class);
 			$isObject = true;

diff --git a/src/Rules/Classes/ClassConstantRule.php b/src/Rules/Classes/ClassConstantRule.php
@@ -130,7 +130,7 @@ public function processNode(Node $node, Scope $scope): array
 					];
 				}
 
-				if ($classType->isString()->yes()) {
+				if (!$class instanceof Node\Scalar\String_ && $classType->isString()->yes()) {
 					return [
 						RuleErrorBuilder::message('Accessing ::class constant on a dynamic string is not supported in PHP.')
 							->nonIgnorable()

diff --git a/tests/PHPStan/Analyser/data/class-constant-on-expr.php b/tests/PHPStan/Analyser/data/class-constant-on-expr.php
@@ -18,6 +18,7 @@ public function doFoo(
 		assertType('*ERROR*', $string::class);
 		assertType('class-string<stdClass>|null', $stdOrNull::class);
 		assertType('*ERROR*', $stringOrNull::class);
+		assertType("'Foo'", 'Foo'::class);
 	}
 
 }
diff --git a/tests/PHPStan/Rules/Classes/ClassConstantRuleTest.php b/tests/PHPStan/Rules/Classes/ClassConstantRuleTest.php
@@ -199,6 +199,10 @@ public function dataClassConstantOnExpression(): array
 						'Accessing ::class constant on an expression is supported only on PHP 8.0 and later.',
 						18,
 					],
+					[
+						'Accessing ::class constant on an expression is supported only on PHP 8.0 and later.',
+						19,
+					],
 				],
 			],
 			[

diff --git a/tests/PHPStan/Rules/Classes/data/class-constant-on-expr.php b/tests/PHPStan/Rules/Classes/data/class-constant-on-expr.php
@@ -16,6 +16,7 @@ public function doFoo(
 		echo $string::class;
 		echo $stdOrNull::class;
 		echo $stringOrNull::class;
+		echo 'Foo'::class;
 	}
 
 }