NoopNodeCallback

Author: ondrejmirtes

src/Analyser/Generator/ExprHandler/AssignHandler.php

@@ -29,6 +29,7 @@
 use PHPStan\Analyser\Generator\GeneratorScope;
 use PHPStan\Analyser\Generator\InternalThrowPoint;
 use PHPStan\Analyser\Generator\NodeCallbackRequest;
+use PHPStan\Analyser\Generator\NoopNodeCallback;
 use PHPStan\Analyser\Generator\TypeExprRequest;
 use PHPStan\Analyser\Generator\TypeExprResult;
 use PHPStan\Analyser\ImpurePoint;
@@ -338,9 +339,7 @@ private function processStmtVarAnnotation(GeneratorScope $scope, Node\Stmt $stmt
 					yield new NodeCallbackRequest(new VarTagChangedExpressionTypeNode($varTag, $variableNode), $scope);
 				}
 
-				// todo NoopExprAnalysisRequest
-				$variableNodeResult = yield new ExprAnalysisRequest($stmt, $variableNode, $scope, ExpressionContext::createDeep(), static function () {
-				});
+				$variableNodeResult = yield new ExprAnalysisRequest($stmt, $variableNode, $scope, ExpressionContext::createDeep(), new NoopNodeCallback());
 
 				$assignVarGen = $scope->assignVariable(
 					$name,
@@ -640,14 +639,12 @@ private function processAssignVar(
 			}
 
 			if (!$varType->isArray()->yes() && !(new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->no()) {
-				// todo NoopExprAnalysisRequest
 				$throwPoints = array_merge($throwPoints, (yield new ExprAnalysisRequest(
 					$stmt,
 					new MethodCall($var, 'offsetSet'),
 					$scope,
 					$context,
-					static function (): void {
-					},
+					new NoopNodeCallback(),
 				))->throwPoints);
 			}
 
@@ -758,14 +755,12 @@ static function (): void {
 				$scope = $assignExprGen->getReturn();
 				// simulate dynamic property assign by __set to get throw points
 				if (!$propertyHolderType->hasMethod('__set')->no()) {
-					// todo NoopExprAnalysisRequest
 					$throwPoints = array_merge($throwPoints, (yield new ExprAnalysisRequest(
 						$stmt,
 						new MethodCall($var->var, '__set'),
 						$scope,
 						$context,
-						static function (): void {
-						},
+						new NoopNodeCallback(),
 					))->throwPoints);
 				}
 			}
@@ -975,8 +970,7 @@ static function (GeneratorScope $scope): Generator {
 			}
 
 			// 1. eval root expr
-			$varResult = yield new ExprAnalysisRequest($stmt, $var, $scope, $context->enterDeep(), static function () {
-			}); // todo Noop...
+			$varResult = yield new ExprAnalysisRequest($stmt, $var, $scope, $context->enterDeep(), new NoopNodeCallback());
 			$hasYield = $varResult->hasYield;
 			$throwPoints = $varResult->throwPoints;
 			$impurePoints = $varResult->impurePoints;

src/Analyser/Generator/GeneratorNodeScopeResolver.php

@@ -256,7 +256,7 @@ static function (Node $node, Scope $scope) use ($alternativeNodeCallback, $nodeC
 						throw new ShouldNotHappenException('Pending fibers with an empty stack should be about synthetic nodes');
 					}
 
-					// todo NoopExprAnalysisRequest
+					// todo problem with noop callback
 					$this->processStmtNodes(
 						$fibersStorage,
 						$exprAnalysisResultStorage,
@@ -352,7 +352,12 @@ private function analyseStmt(Stmt $stmt, GeneratorScope $scope, StatementContext
 	 */
 	private function analyseExpr(ExprAnalysisResultStorage $storage, Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context, ?callable $alternativeNodeCallback): Generator
 	{
-		if ($storage->findExprAnalysisResult($expr) !== null) {
+		$foundExprAnalysisResult = $storage->findExprAnalysisResult($expr);
+		if ($foundExprAnalysisResult !== null) {
+			if ($alternativeNodeCallback instanceof NoopNodeCallback) {
+				return $foundExprAnalysisResult;
+			}
+
 			throw new ShouldNotHappenException(sprintf('Expr %s on line %d has already been analysed', $this->exprPrinter->printExpr($expr), $expr->getStartLine()));
 		}
 

src/Analyser/Generator/NoopNodeCallback.php

@@ -0,0 +1,18 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Analyser\Generator;
+
+use PhpParser\Node;
+use PHPStan\Analyser\Scope;
+
+final class NoopNodeCallback
+{
+
+	/**
+	 * @param callable(Node, Scope): void $nodeCallback
+	 */
+	public function __invoke(Node $node, Scope $scope, callable $nodeCallback): void
+	{
+	}
+
+}