Inject analysis settings into statement handlers instead of reading them from NodeScopeResolver

IfHandler, ForHandler, WhileHandler, DoWhileHandler and ForeachHandler
receive treatPhpDocTypesAsCertain, polluteScopeWithLoopInitialAssignments
and polluteScopeWithAlwaysIterableForeach as #[AutowiredParameter]s, and
ClassLikeHandler receives the ReadWritePropertiesExtension collection.
NodeScopeResolver drops the accessors and the constructor parameters.

Tests configure these through getAdditionalConfigFiles() now: cases that ran
with non-default values move into sibling test classes backed by shared
neon files, and the ReadWritePropertiesExtension doubles become services.
RuleTestCase::getReadWritePropertiesExtensions(),
shouldPolluteScopeWithLoopInitialAssignments() and
shouldPolluteScopeWithAlwaysIterableForeach() no longer configure the
analysis - overriding them with a value that differs from the configuration
fails the test instead of silently changing its meaning.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_014hgcbwfKQnye2coQXtX5XU

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -27,7 +27,6 @@
 use PHPStan\Analyser\Generics\TemplateArgumentObserver;
 use PHPStan\Analyser\Generics\TemplateArgumentStats;
 use PHPStan\DependencyInjection\AutowiredExtensions;
-use PHPStan\DependencyInjection\AutowiredParameter;
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\DependencyInjection\ExtensionsCollection;
@@ -41,7 +40,6 @@
 use PHPStan\Node\StaticMethodCallExpressionNode;
 use PHPStan\Reflection\Native\NativeMethodReflection;
 use PHPStan\Reflection\Php\PhpMethodReflection;
-use PHPStan\Rules\Properties\ReadWritePropertiesExtension;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\MixedType;
@@ -116,23 +114,14 @@ class NodeScopeResolver
 	public static array $guardProcessedExprIds = [];
 
 	/**
-	 * @param ExtensionsCollection<ReadWritePropertiesExtension> $readWritePropertiesExtensions
 	 * @param ExtensionsCollection<PerFileAnalysisResettable> $perFileAnalysisResettables
 	 */
 	public function __construct(
 		private readonly Container $container,
 		private readonly TemplateArgumentObserver $templateArgumentObserver,
 		private readonly FileHelper $fileHelper,
-		#[AutowiredExtensions(of: ReadWritePropertiesExtension::class)]
-		private readonly ExtensionsCollection $readWritePropertiesExtensions,
 		#[AutowiredExtensions(of: PerFileAnalysisResettable::class)]
 		private readonly ExtensionsCollection $perFileAnalysisResettables,
-		#[AutowiredParameter]
-		private readonly bool $polluteScopeWithLoopInitialAssignments,
-		#[AutowiredParameter]
-		private readonly bool $polluteScopeWithAlwaysIterableForeach,
-		#[AutowiredParameter]
-		private readonly bool $treatPhpDocTypesAsCertain,
 		private readonly ExpressionResultFactory $expressionResultFactory,
 		private readonly StatementsHandler $statementsHandler,
 	)
@@ -431,27 +420,6 @@ public function isAnalysedFile(string $fileName): bool
 		return isset($this->analysedFiles[$fileName]);
 	}
 
-	public function shouldPolluteScopeWithLoopInitialAssignments(): bool
-	{
-		return $this->polluteScopeWithLoopInitialAssignments;
-	}
-
-	public function shouldPolluteScopeWithAlwaysIterableForeach(): bool
-	{
-		return $this->polluteScopeWithAlwaysIterableForeach;
-	}
-
-	public function shouldTreatPhpDocTypesAsCertain(): bool
-	{
-		return $this->treatPhpDocTypesAsCertain;
-	}
-
-	/** @return ExtensionsCollection<ReadWritePropertiesExtension> */
-	public function getReadWritePropertiesExtensions(): ExtensionsCollection
-	{
-		return $this->readWritePropertiesExtensions;
-	}
-
 	/** Whether an on-demand walk answers already processed real nodes from their stored results (see processExprOnDemand()). */
 	public function isReturningStoredExpressionResults(): bool
 	{

src/Analyser/StmtHandler/ClassLikeHandler.php

@@ -22,7 +22,9 @@
 use PHPStan\BetterReflection\Reflector\Reflector;
 use PHPStan\BetterReflection\SourceLocator\Ast\Strategy\NodeToReflection;
 use PHPStan\BetterReflection\SourceLocator\Located\LocatedSource;
+use PHPStan\DependencyInjection\AutowiredExtensions;
 use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\DependencyInjection\ExtensionsCollection;
 use PHPStan\File\FileReader;
 use PHPStan\Node\ClassConstantsNode;
 use PHPStan\Node\ClassMethodsNode;
@@ -32,6 +34,7 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ClassReflectionFactory;
 use PHPStan\Reflection\ReflectionProvider;
+use PHPStan\Rules\Properties\ReadWritePropertiesExtension;
 use PHPStan\ShouldNotHappenException;
 use function sprintf;
 use function usort;
@@ -46,12 +49,17 @@
 final class ClassLikeHandler implements StmtHandler
 {
 
+	/**
+	 * @param ExtensionsCollection<ReadWritePropertiesExtension> $readWritePropertiesExtensions
+	 */
 	public function __construct(
 		private Reflector $reflector,
 		private ClassReflectionFactory $classReflectionFactory,
 		private CalledMethodProcessor $calledMethodProcessor,
 		private ReflectionProvider $reflectionProvider,
 		private AttributesHandler $attributesHandler,
+		#[AutowiredExtensions(of: ReadWritePropertiesExtension::class)]
+		private ExtensionsCollection $readWritePropertiesExtensions,
 	)
 	{
 	}
@@ -129,7 +137,7 @@ public function processStmt(
 		// Class members have their own inference context, including when the class
 		// declaration is visited during an enclosing body's observation pass.
 		$nodeScopeResolver->processStmtNodesInternal($stmt, $classLikeStatements, $classScope, $storage, $classStatementsGatherer, StatementContext::createTopLevel());
-		$nodeScopeResolver->callNodeCallback($nodeCallback, new ClassPropertiesNode($stmt, $nodeScopeResolver->getReadWritePropertiesExtensions(), $classStatementsGatherer->getProperties(), $classStatementsGatherer->getPropertyUsages(), $classStatementsGatherer->getMethodCalls(), $classStatementsGatherer->getReturnStatementsNodes(), $classStatementsGatherer->getPropertyAssigns(), $classReflection), $classScope, $storage);
+		$nodeScopeResolver->callNodeCallback($nodeCallback, new ClassPropertiesNode($stmt, $this->readWritePropertiesExtensions, $classStatementsGatherer->getProperties(), $classStatementsGatherer->getPropertyUsages(), $classStatementsGatherer->getMethodCalls(), $classStatementsGatherer->getReturnStatementsNodes(), $classStatementsGatherer->getPropertyAssigns(), $classReflection), $classScope, $storage);
 		$nodeScopeResolver->callNodeCallback($nodeCallback, new ClassMethodsNode($stmt, $classStatementsGatherer->getMethods(), $classStatementsGatherer->getMethodCalls(), $classReflection), $classScope, $storage);
 		$nodeScopeResolver->callNodeCallback($nodeCallback, new ClassConstantsNode($stmt, $classStatementsGatherer->getConstants(), $classStatementsGatherer->getConstantFetches(), $classReflection), $classScope, $storage);
 		$classReflection->evictPrivateSymbols();

src/Analyser/StmtHandler/DoWhileHandler.php

@@ -16,6 +16,7 @@
 use PHPStan\Analyser\StatementContext;
 use PHPStan\Analyser\StmtHandler;
 use PHPStan\Analyser\VariableFlow;
+use PHPStan\DependencyInjection\AutowiredParameter;
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Node\DoWhileLoopConditionNode;
 use function array_merge;
@@ -28,6 +29,13 @@
 final class DoWhileHandler implements StmtHandler
 {
 
+	public function __construct(
+		#[AutowiredParameter]
+		private bool $treatPhpDocTypesAsCertain,
+	)
+	{
+	}
+
 	public function supports(Stmt $stmt): bool
 	{
 		return $stmt instanceof Do_;
@@ -137,7 +145,7 @@ public function processStmt(
 
 		$alwaysIterates = false;
 		if ($context->isTopLevel()) {
-			$condBooleanType = ($nodeScopeResolver->shouldTreatPhpDocTypesAsCertain() ? $condResult->getType() : $condResult->getNativeType())->toBoolean();
+			$condBooleanType = ($this->treatPhpDocTypesAsCertain ? $condResult->getType() : $condResult->getNativeType())->toBoolean();
 			$alwaysIterates = $condBooleanType->isTrue()->yes();
 		}
 

src/Analyser/StmtHandler/ForHandler.php

@@ -25,6 +25,7 @@
 use PHPStan\Analyser\TypeSpecifierContext;
 use PHPStan\Analyser\VariableFlow;
 use PHPStan\Analyser\VariableFlowBuilder;
+use PHPStan\DependencyInjection\AutowiredParameter;
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\TrinaryLogic;
 use function array_last;
@@ -41,6 +42,15 @@
 final class ForHandler implements StmtHandler
 {
 
+	public function __construct(
+		#[AutowiredParameter]
+		private bool $polluteScopeWithLoopInitialAssignments,
+		#[AutowiredParameter]
+		private bool $treatPhpDocTypesAsCertain,
+	)
+	{
+	}
+
 	public function supports(Stmt $stmt): bool
 	{
 		return $stmt instanceof For_;
@@ -166,7 +176,7 @@ public function processStmt(
 					// only the last condition expression is relevant whether the loop continues
 					// see https://www.php.net/manual/en/control-structures.for.php
 					if ($condExpr === $lastCondExpr) {
-						$condTruthiness = ($nodeScopeResolver->shouldTreatPhpDocTypesAsCertain() ? $condResult->getType() : $condResult->getNativeType())->toBoolean();
+						$condTruthiness = ($this->treatPhpDocTypesAsCertain ? $condResult->getType() : $condResult->getNativeType())->toBoolean();
 						$isIterableAtLeastOnce = $isIterableAtLeastOnce->and($condTruthiness->isTrue());
 					}
 
@@ -285,20 +295,20 @@ public function processStmt(
 		}
 
 		if ($isIterableAtLeastOnce->no() || $finalScopeResult->isAlwaysTerminating() || ($backEdgeDead && count($breakExitPoints) === 0)) {
-			if ($nodeScopeResolver->shouldPolluteScopeWithLoopInitialAssignments()) {
+			if ($this->polluteScopeWithLoopInitialAssignments) {
 				$finalScope = $initScope;
 			} else {
 				$finalScope = $scope;
 			}
 
 		} elseif ($isIterableAtLeastOnce->maybe()) {
-			if ($nodeScopeResolver->shouldPolluteScopeWithLoopInitialAssignments()) {
+			if ($this->polluteScopeWithLoopInitialAssignments) {
 				$finalScope = $finalScope->mergeWith($initScope);
 			} else {
 				$finalScope = $finalScope->mergeWith($scope);
 			}
 		} else {
-			if (!$nodeScopeResolver->shouldPolluteScopeWithLoopInitialAssignments()) {
+			if (!$this->polluteScopeWithLoopInitialAssignments) {
 				$finalScope = $finalScope->mergeWith($scope);
 			}
 		}

src/Analyser/StmtHandler/ForeachHandler.php

@@ -85,6 +85,8 @@ public function __construct(
 		private bool $implicitThrows,
 		private VarAnnotationProcessor $varAnnotationProcessor,
 		private AssignHandler $assignHandler,
+		#[AutowiredParameter]
+		private bool $polluteScopeWithAlwaysIterableForeach,
 	)
 	{
 	}
@@ -151,7 +153,7 @@ public function processStmt(
 		// walked synthetic would delegate to); the walk is the composition's
 		// miss seam
 		$nonEmptyIterateeScope = $scope;
-		if ($nodeScopeResolver->shouldPolluteScopeWithAlwaysIterableForeach()) {
+		if ($this->polluteScopeWithAlwaysIterableForeach) {
 			$identicalNarrowingHelper = $this->container->getByType(IdenticalNarrowingHelper::class);
 			$emptyArrayType = new ConstantArrayType([], []);
 			$nonEmptyTypes = $identicalNarrowingHelper->specifyIdenticalAgainstType(
@@ -460,7 +462,7 @@ static function () use ($condResult, $emptyArrayType): Type {
 			), TypeSpecifierContext::createTruthy()));
 		} elseif ($isIterableAtLeastOnce->no() || $finalScopeResult->isAlwaysTerminating()) {
 			$finalScope = $scope;
-		} elseif (!$nodeScopeResolver->shouldPolluteScopeWithAlwaysIterableForeach()) {
+		} elseif (!$this->polluteScopeWithAlwaysIterableForeach) {
 			$finalScope = $scope->processAlwaysIterableForeachScopeWithoutPollute($finalScope);
 			// get types from finalScope, but don't create new variables
 		}
@@ -484,7 +486,7 @@ static function () use ($condResult, $emptyArrayType): Type {
 			VariableFlowBuilder::targetWrite($stmt->valueVar, VariableWrite::KIND_FOREACH_VALUE, $finalScope, $storage),
 			$stmt->byRef && $stmt->valueVar instanceof Variable && is_string($stmt->valueVar->name) ? VariableFlow::escape($stmt->valueVar->name) : null,
 		);
-		$loopFlow = VariableFlow::loop($traversableThrowPoint !== null ? VariableFlow::throwing($traversableThrowPoint->getType(), true) : null, VariableFlow::sequence($bindingFlow, $finalScopeResult->getVariableFlow()), null, $isIterableAtLeastOnce->yes() && $nodeScopeResolver->shouldPolluteScopeWithAlwaysIterableForeach(), true);
+		$loopFlow = VariableFlow::loop($traversableThrowPoint !== null ? VariableFlow::throwing($traversableThrowPoint->getType(), true) : null, VariableFlow::sequence($bindingFlow, $finalScopeResult->getVariableFlow()), null, $isIterableAtLeastOnce->yes() && $this->polluteScopeWithAlwaysIterableForeach, true);
 		$bindingWrites = VariableFlowBuilder::writes($bindingFlow);
 		$bindings = [];
 		foreach ($bindingWrites as $write) {

src/Analyser/StmtHandler/IfHandler.php

@@ -13,6 +13,7 @@
 use PHPStan\Analyser\StatementContext;
 use PHPStan\Analyser\StmtHandler;
 use PHPStan\Analyser\VariableFlow;
+use PHPStan\DependencyInjection\AutowiredParameter;
 use PHPStan\DependencyInjection\AutowiredService;
 use function array_merge;
 use function array_reverse;
@@ -25,6 +26,13 @@
 final class IfHandler implements StmtHandler
 {
 
+	public function __construct(
+		#[AutowiredParameter]
+		private bool $treatPhpDocTypesAsCertain,
+	)
+	{
+	}
+
 	public function supports(Stmt $stmt): bool
 	{
 		return $stmt instanceof If_;
@@ -44,7 +52,7 @@ public function processStmt(
 		$elseFlow = null;
 		$condResult = $nodeScopeResolver->processExprNode($stmt, $stmt->cond, $scope, $storage, $nodeCallback, ExpressionContext::createDeep($context->shouldResolveTemplateArguments()));
 		$nodeScopeResolver->callNodeCallback($nodeCallback, $stmt, $entryScope, $storage);
-		$conditionType = ($nodeScopeResolver->shouldTreatPhpDocTypesAsCertain() ? $condResult->getType() : $condResult->getNativeType())->toBoolean();
+		$conditionType = ($this->treatPhpDocTypesAsCertain ? $condResult->getType() : $condResult->getNativeType())->toBoolean();
 		$ifAlwaysTrue = $conditionType->isTrue()->yes();
 		$exitPoints = [];
 		$throwPoints = $condResult->getThrowPoints();
@@ -79,7 +87,7 @@ public function processStmt(
 		foreach ($stmt->elseifs as $elseif) {
 			$condResult = $nodeScopeResolver->processExprNode($stmt, $elseif->cond, $condScope, $storage, $nodeCallback, ExpressionContext::createDeep($context->shouldResolveTemplateArguments()));
 			$nodeScopeResolver->callNodeCallback($nodeCallback, $elseif, $scope, $storage);
-			$elseIfConditionType = ($nodeScopeResolver->shouldTreatPhpDocTypesAsCertain() ? $condResult->getType() : $condResult->getNativeType())->toBoolean();
+			$elseIfConditionType = ($this->treatPhpDocTypesAsCertain ? $condResult->getType() : $condResult->getNativeType())->toBoolean();
 			$throwPoints = array_merge($throwPoints, $condResult->getThrowPoints());
 			$impurePoints = array_merge($impurePoints, $condResult->getImpurePoints());
 			$branchScopeStatementResult = $nodeScopeResolver->processStmtNodesInternal($elseif, $elseif->stmts, $condResult->getTruthyScope(), $storage, $nodeCallback, $context);

src/Analyser/StmtHandler/WhileHandler.php

@@ -17,6 +17,7 @@
 use PHPStan\Analyser\StmtHandler;
 use PHPStan\Analyser\TypeSpecifierContext;
 use PHPStan\Analyser\VariableFlow;
+use PHPStan\DependencyInjection\AutowiredParameter;
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Node\BreaklessWhileLoopNode;
 use function array_merge;
@@ -29,6 +30,15 @@
 final class WhileHandler implements StmtHandler
 {
 
+	public function __construct(
+		#[AutowiredParameter]
+		private bool $polluteScopeWithLoopInitialAssignments,
+		#[AutowiredParameter]
+		private bool $treatPhpDocTypesAsCertain,
+	)
+	{
+	}
+
 	public function supports(Stmt $stmt): bool
 	{
 		return $stmt instanceof While_;
@@ -51,10 +61,10 @@ public function processStmt(
 		$scope->pushExpressionResultStorage($storage);
 		try {
 			$condResult = $nodeScopeResolver->processExprNode($stmt, $stmt->cond, $scope, $storage, new NoopNodeCallback(), ExpressionContext::createDeep(resolveTemplateArguments: false));
-			$beforeCondBooleanType = ($nodeScopeResolver->shouldTreatPhpDocTypesAsCertain() ? $condResult->getType() : $condResult->getNativeType())->toBoolean();
+			$beforeCondBooleanType = ($this->treatPhpDocTypesAsCertain ? $condResult->getType() : $condResult->getNativeType())->toBoolean();
 			$condScope = $condResult->getFalseyScope();
 			if (!$context->isTopLevel() && $beforeCondBooleanType->isFalse()->yes()) {
-				if (!$nodeScopeResolver->shouldPolluteScopeWithLoopInitialAssignments()) {
+				if (!$this->polluteScopeWithLoopInitialAssignments) {
 					$scope = $condScope->mergeWith($scope);
 				}
 
@@ -173,7 +183,7 @@ public function processStmt(
 		$alwaysIterates = false;
 		$neverIterates = false;
 		if ($context->isTopLevel()) {
-			$condBooleanType = ($nodeScopeResolver->shouldTreatPhpDocTypesAsCertain() ? $bodyCondResult->getType() : $bodyCondResult->getNativeType())->toBoolean();
+			$condBooleanType = ($this->treatPhpDocTypesAsCertain ? $bodyCondResult->getType() : $bodyCondResult->getNativeType())->toBoolean();
 			$alwaysIterates = $condBooleanType->isTrue()->yes();
 			$neverIterates = $condBooleanType->isFalse()->yes();
 		}
@@ -200,7 +210,7 @@ public function processStmt(
 			$finalScope = null;
 		}
 		if (!$isIterableAtLeastOnce) {
-			if (!$nodeScopeResolver->shouldPolluteScopeWithLoopInitialAssignments()) {
+			if (!$this->polluteScopeWithLoopInitialAssignments) {
 				$condScope = $condScope->mergeWith($scope);
 			}
 			$finalScope = $finalScope === null ? $condScope : $finalScope->mergeWith($condScope);