Add ExprAnalysisResultStorage as parameter to ExprHandler

ondrejmirtes · ondrejmirtes · commit 25de2cf438ab · 2025-11-13T14:25:38.000+01:00
diff --git a/src/Analyser/Generator/ExprHandler.php b/src/Analyser/Generator/ExprHandler.php
@@ -24,6 +24,6 @@ public function supports(Expr $expr): bool;
 	 * @param T $expr
 	 * @return Generator<int, ExprAnalysisRequest|NodeCallbackRequest, ExprAnalysisResult, ExprAnalysisResult>
 	 */
-	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context): Generator;
+	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExprAnalysisResultStorage $storage, ExpressionContext $context): Generator;
 
 }
diff --git a/src/Analyser/Generator/ExprHandler/AssignHandler.php b/src/Analyser/Generator/ExprHandler/AssignHandler.php
@@ -9,6 +9,7 @@
 use PHPStan\Analyser\ExpressionContext;
 use PHPStan\Analyser\Generator\ExprAnalysisRequest;
 use PHPStan\Analyser\Generator\ExprAnalysisResult;
+use PHPStan\Analyser\Generator\ExprAnalysisResultStorage;
 use PHPStan\Analyser\Generator\ExprHandler;
 use PHPStan\Analyser\Generator\GeneratorScope;
 use PHPStan\DependencyInjection\AutowiredService;
@@ -28,7 +29,7 @@ public function supports(Expr $expr): bool
 		return $expr instanceof Assign;
 	}
 
-	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context): Generator
+	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExprAnalysisResultStorage $storage, ExpressionContext $context): Generator
 	{
 		if (!$expr->var instanceof Expr\Variable || !is_string($expr->var->name)) {
 			throw new ShouldNotHappenException('Not implemented');
diff --git a/src/Analyser/Generator/ExprHandler/CastIntHandler.php b/src/Analyser/Generator/ExprHandler/CastIntHandler.php
@@ -9,6 +9,7 @@
 use PHPStan\Analyser\ExpressionContext;
 use PHPStan\Analyser\Generator\ExprAnalysisRequest;
 use PHPStan\Analyser\Generator\ExprAnalysisResult;
+use PHPStan\Analyser\Generator\ExprAnalysisResultStorage;
 use PHPStan\Analyser\Generator\ExprHandler;
 use PHPStan\Analyser\Generator\GeneratorScope;
 use PHPStan\DependencyInjection\AutowiredService;
@@ -25,7 +26,7 @@ public function supports(Expr $expr): bool
 		return $expr instanceof Int_;
 	}
 
-	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context): Generator
+	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExprAnalysisResultStorage $storage, ExpressionContext $context): Generator
 	{
 		$exprResult = yield new ExprAnalysisRequest($stmt, $expr->expr, $scope, $context->enterDeep());
 
diff --git a/src/Analyser/Generator/ExprHandler/ClassConstFetchHandler.php b/src/Analyser/Generator/ExprHandler/ClassConstFetchHandler.php
@@ -10,6 +10,7 @@
 use PhpParser\Node\Stmt;
 use PHPStan\Analyser\ExpressionContext;
 use PHPStan\Analyser\Generator\ExprAnalysisResult;
+use PHPStan\Analyser\Generator\ExprAnalysisResultStorage;
 use PHPStan\Analyser\Generator\ExprHandler;
 use PHPStan\Analyser\Generator\GeneratorScope;
 use PHPStan\DependencyInjection\AutowiredService;
@@ -28,7 +29,7 @@ public function supports(Expr $expr): bool
 		return $expr instanceof ClassConstFetch;
 	}
 
-	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context): Generator
+	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExprAnalysisResultStorage $storage, ExpressionContext $context): Generator
 	{
 		if (
 			$expr->class instanceof Name
diff --git a/src/Analyser/Generator/ExprHandler/ClosureHandler.php b/src/Analyser/Generator/ExprHandler/ClosureHandler.php
@@ -8,6 +8,7 @@
 use PhpParser\Node\Stmt;
 use PHPStan\Analyser\ExpressionContext;
 use PHPStan\Analyser\Generator\ExprAnalysisResult;
+use PHPStan\Analyser\Generator\ExprAnalysisResultStorage;
 use PHPStan\Analyser\Generator\ExprHandler;
 use PHPStan\Analyser\Generator\GeneratorScope;
 use PHPStan\Analyser\Generator\StmtsAnalysisRequest;
@@ -27,7 +28,7 @@ public function supports(Expr $expr): bool
 		return $expr instanceof Closure;
 	}
 
-	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context): Generator
+	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExprAnalysisResultStorage $storage, ExpressionContext $context): Generator
 	{
 		$result = yield new StmtsAnalysisRequest($expr->stmts, $scope, StatementContext::createTopLevel()); // @phpstan-ignore generator.valueType
 		$scope = $result->scope;
diff --git a/src/Analyser/Generator/ExprHandler/FuncCallHandler.php b/src/Analyser/Generator/ExprHandler/FuncCallHandler.php
@@ -10,6 +10,7 @@
 use PHPStan\Analyser\ExpressionContext;
 use PHPStan\Analyser\Generator\ExprAnalysisRequest;
 use PHPStan\Analyser\Generator\ExprAnalysisResult;
+use PHPStan\Analyser\Generator\ExprAnalysisResultStorage;
 use PHPStan\Analyser\Generator\ExprHandler;
 use PHPStan\Analyser\Generator\GeneratorScope;
 use PHPStan\DependencyInjection\AutowiredService;
@@ -33,7 +34,7 @@ public function supports(Expr $expr): bool
 		return $expr instanceof FuncCall;
 	}
 
-	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context): Generator
+	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExprAnalysisResultStorage $storage, ExpressionContext $context): Generator
 	{
 		$throwPoints = [];
 		$impurePoints = [];
diff --git a/src/Analyser/Generator/ExprHandler/MethodCallHandler.php b/src/Analyser/Generator/ExprHandler/MethodCallHandler.php
@@ -10,6 +10,7 @@
 use PHPStan\Analyser\ExpressionContext;
 use PHPStan\Analyser\Generator\ExprAnalysisRequest;
 use PHPStan\Analyser\Generator\ExprAnalysisResult;
+use PHPStan\Analyser\Generator\ExprAnalysisResultStorage;
 use PHPStan\Analyser\Generator\ExprHandler;
 use PHPStan\Analyser\Generator\GeneratorScope;
 use PHPStan\DependencyInjection\AutowiredService;
@@ -28,7 +29,7 @@ public function supports(Expr $expr): bool
 		return $expr instanceof MethodCall;
 	}
 
-	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context): Generator
+	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExprAnalysisResultStorage $storage, ExpressionContext $context): Generator
 	{
 		if (!$expr->name instanceof Identifier) {
 			throw new ShouldNotHappenException('Not implemented');
diff --git a/src/Analyser/Generator/ExprHandler/NewHandler.php b/src/Analyser/Generator/ExprHandler/NewHandler.php
@@ -9,6 +9,7 @@
 use PhpParser\Node\Stmt;
 use PHPStan\Analyser\ExpressionContext;
 use PHPStan\Analyser\Generator\ExprAnalysisResult;
+use PHPStan\Analyser\Generator\ExprAnalysisResultStorage;
 use PHPStan\Analyser\Generator\ExprHandler;
 use PHPStan\Analyser\Generator\GeneratorScope;
 use PHPStan\DependencyInjection\AutowiredService;
@@ -27,7 +28,7 @@ public function supports(Expr $expr): bool
 		return $expr instanceof New_;
 	}
 
-	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context): Generator
+	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExprAnalysisResultStorage $storage, ExpressionContext $context): Generator
 	{
 		if (!$expr->class instanceof Name) {
 			throw new ShouldNotHappenException('Not implemented');
diff --git a/src/Analyser/Generator/ExprHandler/ScalarIntHandler.php b/src/Analyser/Generator/ExprHandler/ScalarIntHandler.php
@@ -8,6 +8,7 @@
 use PhpParser\Node\Stmt;
 use PHPStan\Analyser\ExpressionContext;
 use PHPStan\Analyser\Generator\ExprAnalysisResult;
+use PHPStan\Analyser\Generator\ExprAnalysisResultStorage;
 use PHPStan\Analyser\Generator\ExprHandler;
 use PHPStan\Analyser\Generator\GeneratorScope;
 use PHPStan\DependencyInjection\AutowiredService;
@@ -25,7 +26,7 @@ public function supports(Expr $expr): bool
 		return $expr instanceof Int_;
 	}
 
-	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context): Generator
+	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExprAnalysisResultStorage $storage, ExpressionContext $context): Generator
 	{
 		yield from [];
 		return new ExprAnalysisResult(
diff --git a/src/Analyser/Generator/ExprHandler/ScalarStringHandler.php b/src/Analyser/Generator/ExprHandler/ScalarStringHandler.php
@@ -8,6 +8,7 @@
 use PhpParser\Node\Stmt;
 use PHPStan\Analyser\ExpressionContext;
 use PHPStan\Analyser\Generator\ExprAnalysisResult;
+use PHPStan\Analyser\Generator\ExprAnalysisResultStorage;
 use PHPStan\Analyser\Generator\ExprHandler;
 use PHPStan\Analyser\Generator\GeneratorScope;
 use PHPStan\DependencyInjection\AutowiredService;
@@ -25,7 +26,7 @@ public function supports(Expr $expr): bool
 		return $expr instanceof String_;
 	}
 
-	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context): Generator
+	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExprAnalysisResultStorage $storage, ExpressionContext $context): Generator
 	{
 		yield from [];
 		return new ExprAnalysisResult(
diff --git a/src/Analyser/Generator/ExprHandler/VariableHandler.php b/src/Analyser/Generator/ExprHandler/VariableHandler.php
@@ -8,6 +8,7 @@
 use PhpParser\Node\Stmt;
 use PHPStan\Analyser\ExpressionContext;
 use PHPStan\Analyser\Generator\ExprAnalysisResult;
+use PHPStan\Analyser\Generator\ExprAnalysisResultStorage;
 use PHPStan\Analyser\Generator\ExprHandler;
 use PHPStan\Analyser\Generator\GeneratorScope;
 use PHPStan\DependencyInjection\AutowiredService;
@@ -27,7 +28,7 @@ public function supports(Expr $expr): bool
 		return $expr instanceof Variable;
 	}
 
-	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context): Generator
+	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExprAnalysisResultStorage $storage, ExpressionContext $context): Generator
 	{
 		if (!is_string($expr->name)) {
 			throw new ShouldNotHappenException('Not implemented');
diff --git a/src/Analyser/Generator/GeneratorNodeScopeResolver.php b/src/Analyser/Generator/GeneratorNodeScopeResolver.php
@@ -291,7 +291,7 @@ private function analyseExpr(ExprAnalysisResultStorage $storage, Stmt $stmt, Exp
 				continue;
 			}
 
-			$gen = $exprHandler->analyseExpr($stmt, $expr, $scope, $context);
+			$gen = $exprHandler->analyseExpr($stmt, $expr, $scope, $storage, $context);
 			yield from $gen;
 
 			$exprAnalysisResult = $gen->getReturn();

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ public function supports(Expr $expr): bool;`
`24`	`24`	`* @param T $expr`
`25`	`25`	`* @return Generator<int, ExprAnalysisRequest\|NodeCallbackRequest, ExprAnalysisResult, ExprAnalysisResult>`
`26`	`26`	`*/`
`27`		`- public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context): Generator;`
	`27`	`+ public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExprAnalysisResultStorage $storage, ExpressionContext $context): Generator;`
`28`	`28`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`use PHPStan\Analyser\ExpressionContext;`
`10`	`10`	`use PHPStan\Analyser\Generator\ExprAnalysisRequest;`
`11`	`11`	`use PHPStan\Analyser\Generator\ExprAnalysisResult;`
	`12`	`+use PHPStan\Analyser\Generator\ExprAnalysisResultStorage;`
`12`	`13`	`use PHPStan\Analyser\Generator\ExprHandler;`
`13`	`14`	`use PHPStan\Analyser\Generator\GeneratorScope;`
`14`	`15`	`use PHPStan\DependencyInjection\AutowiredService;`
`@@ -25,7 +26,7 @@ public function supports(Expr $expr): bool`
`25`	`26`	`return $expr instanceof Int_;`
`26`	`27`	`}`
`27`	`28`
`28`		`- public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context): Generator`
	`29`	`+ public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExprAnalysisResultStorage $storage, ExpressionContext $context): Generator`
`29`	`30`	`{`
`30`	`31`	`$exprResult = yield new ExprAnalysisRequest($stmt, $expr->expr, $scope, $context->enterDeep());`
`31`	`32`