Simplify access to class reflections in ClassConstantsNode and ClassM…

…ethodsNode rules.
rajyan · Jul 17, 2023 · 6d08225 · 6d08225
1 parent 32ca340
commit 6d08225
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -706,8 +706,8 @@ private function processStmtNode(
 
 			$this->processStmtNodes($stmt, $stmt->stmts, $classScope, $classStatementsGatherer, $context);
 			$nodeCallback(new ClassPropertiesNode($stmt, $this->readWritePropertiesExtensionProvider, $classStatementsGatherer->getProperties(), $classStatementsGatherer->getPropertyUsages(), $classStatementsGatherer->getMethodCalls(), $classStatementsGatherer->getReturnStatementsNodes(), $classReflection), $classScope);
-			$nodeCallback(new ClassMethodsNode($stmt, $classStatementsGatherer->getMethods(), $classStatementsGatherer->getMethodCalls()), $classScope);
-			$nodeCallback(new ClassConstantsNode($stmt, $classStatementsGatherer->getConstants(), $classStatementsGatherer->getConstantFetches()), $classScope);
+			$nodeCallback(new ClassMethodsNode($stmt, $classStatementsGatherer->getMethods(), $classStatementsGatherer->getMethodCalls(), $classReflection), $classScope);
+			$nodeCallback(new ClassConstantsNode($stmt, $classStatementsGatherer->getConstants(), $classStatementsGatherer->getConstantFetches(), $classReflection), $classScope);
 			$classReflection->evictPrivateSymbols();
 			$this->calledMethodResults = [];
 		} elseif ($stmt instanceof Node\Stmt\Property) {

diff --git a/src/Node/ClassConstantsNode.php b/src/Node/ClassConstantsNode.php
@@ -6,6 +6,7 @@
 use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\NodeAbstract;
 use PHPStan\Node\Constant\ClassConstantFetch;
+use PHPStan\Reflection\ClassReflection;
 
 /** @api */
 class ClassConstantsNode extends NodeAbstract implements VirtualNode
@@ -15,7 +16,7 @@ class ClassConstantsNode extends NodeAbstract implements VirtualNode
 	 * @param ClassConst[] $constants
 	 * @param ClassConstantFetch[] $fetches
 	 */
-	public function __construct(private ClassLike $class, private array $constants, private array $fetches)
+	public function __construct(private ClassLike $class, private array $constants, private array $fetches, private ClassReflection $classReflection)
 	{
 		parent::__construct($class->getAttributes());
 	}
@@ -54,4 +55,9 @@ public function getSubNodeNames(): array
 		return [];
 	}
 
+	public function getClassReflection(): ClassReflection
+	{
+		return $this->classReflection;
+	}
+
 }
diff --git a/src/Node/ClassMethodsNode.php b/src/Node/ClassMethodsNode.php
@@ -5,6 +5,7 @@
 use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\NodeAbstract;
 use PHPStan\Node\Method\MethodCall;
+use PHPStan\Reflection\ClassReflection;
 
 /** @api */
 class ClassMethodsNode extends NodeAbstract implements VirtualNode
@@ -14,7 +15,7 @@ class ClassMethodsNode extends NodeAbstract implements VirtualNode
 	 * @param ClassMethod[] $methods
 	 * @param array<int, MethodCall> $methodCalls
 	 */
-	public function __construct(private ClassLike $class, private array $methods, private array $methodCalls)
+	public function __construct(private ClassLike $class, private array $methods, private array $methodCalls, private ClassReflection $classReflection)
 	{
 		parent::__construct($class->getAttributes());
 	}
@@ -53,4 +54,9 @@ public function getSubNodeNames(): array
 		return [];
 	}
 
+	public function getClassReflection(): ClassReflection
+	{
+		return $this->classReflection;
+	}
+
 }
diff --git a/src/Rules/DeadCode/UnusedPrivateConstantRule.php b/src/Rules/DeadCode/UnusedPrivateConstantRule.php
@@ -8,7 +8,6 @@
 use PHPStan\Rules\Constants\AlwaysUsedClassConstantsExtensionProvider;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPStan\ShouldNotHappenException;
 use function sprintf;
 
 /**
@@ -31,11 +30,8 @@ public function processNode(Node $node, Scope $scope): array
 		if (!$node->getClass() instanceof Node\Stmt\Class_ && !$node->getClass() instanceof Node\Stmt\Enum_) {
 			return [];
 		}
-		if (!$scope->isInClass()) {
-			throw new ShouldNotHappenException();
-		}
 
-		$classReflection = $scope->getClassReflection();
+		$classReflection = $node->getClassReflection();
 
 		$constants = [];
 		foreach ($node->getConstants() as $constant) {

diff --git a/src/Rules/DeadCode/UnusedPrivateMethodRule.php b/src/Rules/DeadCode/UnusedPrivateMethodRule.php
@@ -9,7 +9,6 @@
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\Constant\ConstantStringType;
 use function array_map;
 use function count;
@@ -32,10 +31,7 @@ public function processNode(Node $node, Scope $scope): array
 		if (!$node->getClass() instanceof Node\Stmt\Class_ && !$node->getClass() instanceof Node\Stmt\Enum_) {
 			return [];
 		}
-		if (!$scope->isInClass()) {
-			throw new ShouldNotHappenException();
-		}
-		$classReflection = $scope->getClassReflection();
+		$classReflection = $node->getClassReflection();
 		$constructor = null;
 		if ($classReflection->hasConstructor()) {
 			$constructor = $classReflection->getConstructor();