VirtualAssignNodeCallback + ShallowNodeCallback

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -2553,7 +2553,7 @@ public function processExprNode(
 
 		$existingExprResult = $storage->findResult($expr);
 		if ($existingExprResult !== null) {
-			if ($nodeCallback instanceof NoopNodeCallback) {
+			if ($nodeCallback instanceof ShallowNodeCallback) {
 				return $existingExprResult;
 			}
 			throw new ShouldNotHappenException(sprintf('Expr %s on line %d has already been analysed', get_class($expr), $expr->getStartLine()));
@@ -6404,13 +6404,7 @@ private function processVirtualAssign(MutatingScope $scope, ExpressionResultStor
 			$stmt,
 			$var,
 			$assignedExpr,
-			static function (Node $node, Scope $scope) use ($nodeCallback): void {
-				if (!$node instanceof PropertyAssignNode && !$node instanceof VariableAssignNode) {
-					return;
-				}
-
-				$nodeCallback($node, $scope);
-			},
+			new VirtualAssignNodeCallback($nodeCallback),
 			ExpressionContext::createDeep(),
 			static fn (MutatingScope $scope): ExpressionResult => new ExpressionResult($scope, false, false, [], []),
 			false,

src/Analyser/NoopNodeCallback.php

@@ -2,10 +2,12 @@
 
 namespace PHPStan\Analyser;
 
-final class NoopNodeCallback
+use PhpParser\Node;
+
+final class NoopNodeCallback implements ShallowNodeCallback
 {
 
-	public function __invoke(): void
+	public function __invoke(Node $node, Scope $scope): void
 	{
 		// noop
 	}

src/Analyser/ShallowNodeCallback.php

@@ -0,0 +1,12 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Analyser;
+
+use PhpParser\Node;
+
+interface ShallowNodeCallback
+{
+
+	public function __invoke(Node $node, Scope $scope): void;
+
+}

src/Analyser/VirtualAssignNodeCallback.php

@@ -0,0 +1,28 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Analyser;
+
+use PhpParser\Node;
+use PHPStan\Node\PropertyAssignNode;
+use PHPStan\Node\VariableAssignNode;
+
+final class VirtualAssignNodeCallback implements ShallowNodeCallback
+{
+
+	/**
+	 * @param callable(Node $node, Scope $scope): void $originalNodeCallback
+	 */
+	public function __construct(private mixed $originalNodeCallback)
+	{
+	}
+
+	public function __invoke(Node $node, Scope $scope): void
+	{
+		if (!$node instanceof PropertyAssignNode && !$node instanceof VariableAssignNode) {
+			return;
+		}
+
+		($this->originalNodeCallback)($node, $scope);
+	}
+
+}