Fix class constant scope

Author: zonuexe

src/Rules/Classes/ClassConstantRule.php

@@ -3,7 +3,9 @@
 namespace PHPStan\Rules\Classes;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr\BinaryOp\Identical;
 use PhpParser\Node\Expr\ClassConstFetch;
+use PhpParser\Node\Scalar\String_;
 use PHPStan\Analyser\NullsafeOperatorHelper;
 use PHPStan\Analyser\Scope;
 use PHPStan\Internal\SprintfHelper;
@@ -21,7 +23,6 @@
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\VerbosityLevel;
-use function array_map;
 use function array_merge;
 use function in_array;
 use function sprintf;
@@ -51,14 +52,18 @@ public function processNode(Node $node, Scope $scope): array
 	{
 		$errors = [];
 		if ($node->name instanceof Node\Identifier) {
-			$constantNames = [$node->name->name];
+			$constantNameScopes = [$node->name->name => $scope];
 		} else {
-			$fetchType = $scope->getType($node->name);
-			$constantNames = array_map(static fn ($type): string => $type->getValue(), $fetchType->getConstantStrings());
+			$nameType = $scope->getType($node->name);
+			$constantNameScopes = [];
+			foreach ($nameType->getConstantStrings() as $constantString) {
+				$name = $constantString->getValue();
+				$constantNameScopes[$name] = $scope->filterByTruthyValue(new Identical($node->name, new String_($name)));
+			}
 		}
 
-		foreach ($constantNames as $constantName) {
-			$errors = array_merge($errors, $this->processSingleClassConstFetch($scope, $node, $constantName));
+		foreach ($constantNameScopes as $constantName => $constantScope) {
+			$errors = array_merge($errors, $this->processSingleClassConstFetch($constantScope, $node, $constantName));
 		}
 
 		return $errors;

tests/PHPStan/Rules/Classes/ClassConstantRuleTest.php

@@ -452,6 +452,30 @@ public function testDynamicAccess(): void
 				'Access to undefined constant ClassConstantDynamicAccess\Foo::BUZ.',
 				20,
 			],
+			[
+				'Access to undefined constant ClassConstantDynamicAccess\Foo::FOO.',
+				37,
+			],
+			[
+				'Access to undefined constant ClassConstantDynamicAccess\Foo::BUZ.',
+				39,
+			],
+			[
+				'Access to undefined constant ClassConstantDynamicAccess\Foo::QUX.',
+				41,
+			],
+			[
+				'Access to undefined constant ClassConstantDynamicAccess\Foo::QUX.',
+				44,
+			],
+			[
+				'Access to undefined constant ClassConstantDynamicAccess\Foo::BUZ.',
+				44,
+			],
+			[
+				'Access to undefined constant ClassConstantDynamicAccess\Foo::FOO.',
+				44,
+			],
 		]);
 	}
 

tests/PHPStan/Rules/Classes/data/dynamic-constant-access.php

@@ -5,7 +5,7 @@
 final class Foo
 {
 
-	private const BAR = 'FOO';
+	private const BAR = 'BAR';
 
 	/** @var 'FOO'|'BAR'|'BUZ' */
 	public $name;
@@ -20,4 +20,29 @@ public function test(string $string, object $obj): void
 		echo self::{$this->name};
 	}
 
+	public function testScope(): void
+	{
+		$name1 = 'FOO';
+		$rand = rand();
+		if ($rand === 1) {
+			$foo = 1;
+			$name = $name1;
+		} elseif ($rand === 2) {
+			$name = 'BUZ';
+		} else {
+			$name = 'QUX';
+		}
+
+		if ($name === 'FOO') {
+			echo self::{$name};
+		} elseif ($name === 'BUZ') {
+			echo self::{$name};
+		} else {
+			echo self::{$name};
+		}
+
+		echo self::{$name};
+	}
+
+
 }