analyseExpr - guard against multiple analyses

Author: ondrejmirtes

src/Analyser/Generator/GeneratorNodeScopeResolver.php

@@ -12,6 +12,7 @@
 use PHPStan\Analyser\StatementContext;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\NeverException;
+use PHPStan\Node\Printer\ExprPrinter;
 use PHPStan\ShouldNotHappenException;
 use function array_map;
 use function array_merge;
@@ -62,6 +63,7 @@ final class GeneratorNodeScopeResolver
 {
 
 	public function __construct(
+		private ExprPrinter $exprPrinter,
 		private Container $container,
 	)
 	{
@@ -271,6 +273,10 @@ 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->lookupExprAnalysisResult($expr) !== null) {
+			throw new ShouldNotHappenException(sprintf('Expr %s on line %d has already been analysed', $this->exprPrinter->printExpr($expr), $expr->getStartLine()));
+		}
+
 		if ($alternativeNodeCallback === null) {
 			yield new NodeCallbackRequest($expr, $scope);
 		} else {

tests/PHPStan/Analyser/Generator/GeneratorNodeScopeResolverRuleTest.php

@@ -4,6 +4,7 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\Node\Printer\ExprPrinter;
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -108,7 +109,10 @@ public function testRule(callable $ruleCallback, array $expectedErrors): void
 
 	protected function createNodeScopeResolver(): GeneratorNodeScopeResolver
 	{
-		return new GeneratorNodeScopeResolver(self::getContainer());
+		return new GeneratorNodeScopeResolver(
+			self::getContainer()->getByType(ExprPrinter::class),
+			self::getContainer(),
+		);
 	}
 
 }

tests/PHPStan/Analyser/Generator/GeneratorNodeScopeResolverTest.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\Analyser\Generator;
 
+use PHPStan\Node\Printer\ExprPrinter;
 use PHPStan\Testing\TypeInferenceTestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\RequiresPhp;
@@ -30,7 +31,10 @@ public function testFileAsserts(
 
 	protected static function createNodeScopeResolver(): GeneratorNodeScopeResolver
 	{
-		return new GeneratorNodeScopeResolver(self::getContainer());
+		return new GeneratorNodeScopeResolver(
+			self::getContainer()->getByType(ExprPrinter::class),
+			self::getContainer(),
+		);
 	}
 
 	public static function getAdditionalConfigFiles(): array