Rework ClassStatementsGatherer to be usable in GNSR

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -988,8 +988,26 @@ private function processStmtNode(
 				throw new ShouldNotHappenException();
 			}
 
-			$classStatementsGatherer = new ClassStatementsGatherer($classReflection, $nodeCallback);
-			$this->processAttributeGroups($stmt, $stmt->attrGroups, $classScope, $classStatementsGatherer);
+			$classStatementsGatherer = new ClassStatementsGatherer($classReflection);
+			$classStatementsGathererCallback = new class ($classStatementsGatherer, $nodeCallback) {
+
+				/**
+				 * @param callable(Node $node, Scope $scope): void $nodeCallback
+				 */
+				public function __construct(
+					private ClassStatementsGatherer $classStatementsGatherer,
+					private $nodeCallback,
+				)
+				{
+				}
+
+				public function __invoke(Node $node, Scope $scope): void
+				{
+					($this->classStatementsGatherer)($node, $scope, $this->nodeCallback);
+				}
+
+			};
+			$this->processAttributeGroups($stmt, $stmt->attrGroups, $classScope, $classStatementsGathererCallback);
 
 			$classLikeStatements = $stmt->stmts;
 			if ($this->narrowMethodScopeFromConstructor) {
@@ -1010,7 +1028,7 @@ private function processStmtNode(
 				});
 			}
 
-			$this->processStmtNodesInternal($stmt, $classLikeStatements, $classScope, $classStatementsGatherer, $context);
+			$this->processStmtNodesInternal($stmt, $classLikeStatements, $classScope, $classStatementsGathererCallback, $context);
 			$nodeCallback(new ClassPropertiesNode($stmt, $this->readWritePropertiesExtensionProvider, $classStatementsGatherer->getProperties(), $classStatementsGatherer->getPropertyUsages(), $classStatementsGatherer->getMethodCalls(), $classStatementsGatherer->getReturnStatementsNodes(), $classStatementsGatherer->getPropertyAssigns(), $classReflection), $classScope);
 			$nodeCallback(new ClassMethodsNode($stmt, $classStatementsGatherer->getMethods(), $classStatementsGatherer->getMethodCalls(), $classReflection), $classScope);
 			$nodeCallback(new ClassConstantsNode($stmt, $classStatementsGatherer->getConstants(), $classStatementsGatherer->getConstantFetches(), $classReflection), $classScope);

src/Node/ClassStatementsGatherer.php

@@ -32,9 +32,6 @@ final class ClassStatementsGatherer
 		'array_walk',
 	];
 
-	/** @var callable(Node $node, Scope $scope): void */
-	private $nodeCallback;
-
 	/** @var ClassPropertyNode[] */
 	private array $properties = [];
 
@@ -59,15 +56,10 @@ final class ClassStatementsGatherer
 	/** @var list<PropertyAssign> */
 	private array $propertyAssigns = [];
 
-	/**
-	 * @param callable(Node $node, Scope $scope): void $nodeCallback
-	 */
 	public function __construct(
 		private ClassReflection $classReflection,
-		callable $nodeCallback,
 	)
 	{
-		$this->nodeCallback = $nodeCallback;
 	}
 
 	/**
@@ -134,9 +126,11 @@ public function getPropertyAssigns(): array
 		return $this->propertyAssigns;
 	}
 
-	public function __invoke(Node $node, Scope $scope): void
+	/**
+	 * @param callable(Node $node, Scope $scope): void $nodeCallback
+	 */
+	public function __invoke(Node $node, Scope $scope, callable $nodeCallback): void
 	{
-		$nodeCallback = $this->nodeCallback;
 		$nodeCallback($node, $scope);
 		$this->gatherNodes($node, $scope);
 	}