StmtsAnalysisRequest

Author: ondrejmirtes

src/Analyser/Generator/ExprHandler/ClosureHandler.php

@@ -8,7 +8,7 @@
 use PHPStan\Analyser\Generator\ExprAnalysisResult;
 use PHPStan\Analyser\Generator\ExprHandler;
 use PHPStan\Analyser\Generator\GeneratorScope;
-use PHPStan\Analyser\Generator\StmtAnalysisRequest;
+use PHPStan\Analyser\Generator\StmtsAnalysisRequest;
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Type\ClosureType;
 
@@ -26,10 +26,8 @@ public function supports(Expr $expr): bool
 
 	public function analyseExpr(Expr $expr, GeneratorScope $scope): Generator
 	{
-		foreach ($expr->stmts as $stmt) {
-			$result = yield new StmtAnalysisRequest($stmt, $scope); // @phpstan-ignore generator.valueType
-			$scope = $result->scope;
-		}
+		$result = yield new StmtsAnalysisRequest($expr->stmts, $scope); // @phpstan-ignore generator.valueType
+		$scope = $result->scope;
 
 		return new ExprAnalysisResult(new ClosureType(), $scope);
 	}

src/Analyser/Generator/GeneratorNodeScopeResolver.php

@@ -137,6 +137,11 @@ private function processStmtNodes(
 					$gen = $this->analyzeStmt($yielded->stmt, $yielded->scope);
 					$gen->current();
 					continue;
+				} elseif ($yielded instanceof StmtsAnalysisRequest) {
+					$stack[] = $gen;
+					$gen = $this->analyzeStmts($yielded->stmts, $yielded->scope);
+					$gen->current();
+					continue;
 				} else { // phpcs:ignore
 					throw new NeverException($yielded);
 				}
@@ -192,7 +197,7 @@ private function analyzeStmts(array $stmts, GeneratorScope $scope): Generator
 	}
 
 	/**
-	 * @return Generator<int, ExprAnalysisRequest|StmtAnalysisRequest|NodeCallbackRequest, ExprAnalysisResult|StmtAnalysisResult, StmtAnalysisResult>
+	 * @return Generator<int, ExprAnalysisRequest|StmtAnalysisRequest|StmtsAnalysisRequest|NodeCallbackRequest, ExprAnalysisResult|StmtAnalysisResult, StmtAnalysisResult>
 	 */
 	private function analyzeStmt(Stmt $stmt, GeneratorScope $scope): Generator
 	{

src/Analyser/Generator/StmtHandler.php

@@ -20,7 +20,7 @@ public function supports(Stmt $stmt): bool;
 
 	/**
 	 * @param T $stmt
-	 * @return Generator<int, ExprAnalysisRequest|StmtAnalysisRequest|NodeCallbackRequest, ExprAnalysisResult|StmtAnalysisResult, StmtAnalysisResult>
+	 * @return Generator<int, ExprAnalysisRequest|StmtAnalysisRequest|StmtsAnalysisRequest|NodeCallbackRequest, ExprAnalysisResult|StmtAnalysisResult, StmtAnalysisResult>
 	 */
 	public function analyseStmt(Stmt $stmt, GeneratorScope $scope): Generator;
 

src/Analyser/Generator/StmtHandler/ClassLikeHandler.php

@@ -8,9 +8,9 @@
 use PhpParser\Node\Stmt\Enum_;
 use PhpParser\Node\Stmt\Interface_;
 use PHPStan\Analyser\Generator\GeneratorScope;
-use PHPStan\Analyser\Generator\StmtAnalysisRequest;
 use PHPStan\Analyser\Generator\StmtAnalysisResult;
 use PHPStan\Analyser\Generator\StmtHandler;
+use PHPStan\Analyser\Generator\StmtsAnalysisRequest;
 use PHPStan\DependencyInjection\AutowiredService;
 
 /**
@@ -28,10 +28,8 @@ public function supports(Stmt $stmt): bool
 	public function analyseStmt(Stmt $stmt, GeneratorScope $scope): Generator
 	{
 		//$scope = $scope->enterClass();
-		foreach ($stmt->stmts as $innerStmt) {
-			$result = yield new StmtAnalysisRequest($innerStmt, $scope);
-			$scope = $result->scope;
-		}
+		$result = yield new StmtsAnalysisRequest($stmt->stmts, $scope);
+		$scope = $result->scope;
 
 		return new StmtAnalysisResult($scope);
 	}

src/Analyser/Generator/StmtHandler/ClassMethodHandler.php

@@ -6,9 +6,9 @@
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\ClassMethod;
 use PHPStan\Analyser\Generator\GeneratorScope;
-use PHPStan\Analyser\Generator\StmtAnalysisRequest;
 use PHPStan\Analyser\Generator\StmtAnalysisResult;
 use PHPStan\Analyser\Generator\StmtHandler;
+use PHPStan\Analyser\Generator\StmtsAnalysisRequest;
 use PHPStan\DependencyInjection\AutowiredService;
 
 /**
@@ -31,10 +31,8 @@ public function analyseStmt(Stmt $stmt, GeneratorScope $scope): Generator
 			return new StmtAnalysisResult($scope);
 		}
 
-		foreach ($stmt->stmts as $innerStmt) {
-			$result = yield new StmtAnalysisRequest($innerStmt, $scope);
-			$scope = $result->scope;
-		}
+		$result = yield new StmtsAnalysisRequest($stmt->stmts, $scope);
+		$scope = $result->scope;
 
 		return new StmtAnalysisResult($scope);
 	}

src/Analyser/Generator/StmtHandler/NamespaceHandler.php

@@ -6,9 +6,9 @@
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Namespace_;
 use PHPStan\Analyser\Generator\GeneratorScope;
-use PHPStan\Analyser\Generator\StmtAnalysisRequest;
 use PHPStan\Analyser\Generator\StmtAnalysisResult;
 use PHPStan\Analyser\Generator\StmtHandler;
+use PHPStan\Analyser\Generator\StmtsAnalysisRequest;
 use PHPStan\DependencyInjection\AutowiredService;
 
 /**
@@ -29,10 +29,8 @@ public function analyseStmt(Stmt $stmt, GeneratorScope $scope): Generator
 			$scope = $scope->enterNamespace($stmt->name->toString());
 		}*/
 
-		foreach ($stmt->stmts as $innerStmt) {
-			$result = yield new StmtAnalysisRequest($innerStmt, $scope);
-			$scope = $result->scope;
-		}
+		$result = yield new StmtsAnalysisRequest($stmt->stmts, $scope);
+		$scope = $result->scope;
 
 		return new StmtAnalysisResult($scope);
 	}

src/Analyser/Generator/StmtsAnalysisRequest.php

@@ -0,0 +1,20 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Analyser\Generator;
+
+use PhpParser\Node\Stmt;
+
+final class StmtsAnalysisRequest
+{
+
+	/**
+	 * @param Stmt[] $stmts
+	 */
+	public function __construct(
+		public array $stmts,
+		public GeneratorScope $scope,
+	)
+	{
+	}
+
+}