Merge branch refs/heads/1.12.x into 2.0.x

phpstan · Nov 10, 2024 · d2d137e · d2d137e
2 parents 59ef891 + f2dfd5d
commit d2d137e
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 356 deletions.
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -4865,68 +4865,6 @@ public function processAlwaysIterableForeachScopeWithoutPollute(self $finalScope
 		);
 	}
 
-	public function processAlwaysIterableForScopeWithoutPollute(self $finalScope, self $initScope): self
-	{
-		$expressionTypes = $this->expressionTypes;
-		$initScopeExpressionTypes = $initScope->expressionTypes;
-		foreach ($finalScope->expressionTypes as $variableExprString => $variableTypeHolder) {
-			if (!isset($expressionTypes[$variableExprString])) {
-				if (isset($initScopeExpressionTypes[$variableExprString])) {
-					$expressionTypes[$variableExprString] = ExpressionTypeHolder::createMaybe($variableTypeHolder->getExpr(), $variableTypeHolder->getType());
-					continue;
-				}
-
-				$expressionTypes[$variableExprString] = $variableTypeHolder;
-				continue;
-			}
-
-			$expressionTypes[$variableExprString] = new ExpressionTypeHolder(
-				$variableTypeHolder->getExpr(),
-				$variableTypeHolder->getType(),
-				$variableTypeHolder->getCertainty()->and($expressionTypes[$variableExprString]->getCertainty()),
-			);
-		}
-
-		$nativeTypes = $this->nativeExpressionTypes;
-		$initScopeNativeExpressionTypes = $initScope->nativeExpressionTypes;
-		foreach ($finalScope->nativeExpressionTypes as $variableExprString => $variableTypeHolder) {
-			if (!isset($nativeTypes[$variableExprString])) {
-				if (isset($initScopeNativeExpressionTypes[$variableExprString])) {
-					$nativeTypes[$variableExprString] = ExpressionTypeHolder::createMaybe($variableTypeHolder->getExpr(), $variableTypeHolder->getType());
-					continue;
-				}
-
-				$nativeTypes[$variableExprString] = $variableTypeHolder;
-				continue;
-			}
-
-			$nativeTypes[$variableExprString] = new ExpressionTypeHolder(
-				$variableTypeHolder->getExpr(),
-				$variableTypeHolder->getType(),
-				$variableTypeHolder->getCertainty()->and($nativeTypes[$variableExprString]->getCertainty()),
-			);
-		}
-
-		return $this->scopeFactory->create(
-			$this->context,
-			$this->isDeclareStrictTypes(),
-			$this->getFunction(),
-			$this->getNamespace(),
-			$expressionTypes,
-			$nativeTypes,
-			$this->conditionalExpressions,
-			$this->inClosureBindScopeClasses,
-			$this->anonymousFunctionReflection,
-			$this->inFirstLevelStatement,
-			[],
-			[],
-			[],
-			$this->afterExtractCall,
-			$this->parentScope,
-			$this->nativeTypesPromoted,
-		);
-	}
-
 	public function generalizeWith(self $otherScope): self
 	{
 		$variableTypeHolders = $this->generalizeVariableTypeHolders(

diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -1402,7 +1402,7 @@ private function processStmtNode(
 				}
 			} else {
 				if (!$this->polluteScopeWithLoopInitialAssignments) {
-					$finalScope = $scope->processAlwaysIterableForScopeWithoutPollute($finalScope, $initScope);
+					$finalScope = $finalScope->mergeWith($scope);
 				}
 			}
 

diff --git a/tests/PHPStan/Analyser/ForLoopNoScopePollutionTest.php b/tests/PHPStan/Analyser/ForLoopNoScopePollutionTest.php
diff --git a/tests/PHPStan/Analyser/data/for-loop-no-scope-pollution.php b/tests/PHPStan/Analyser/data/for-loop-no-scope-pollution.php
diff --git a/tests/PHPStan/Analyser/forLoopNoScopePollution.neon b/tests/PHPStan/Analyser/forLoopNoScopePollution.neon
diff --git a/tests/PHPStan/Analyser/nsrt/for-loop.php b/tests/PHPStan/Analyser/nsrt/for-loop.php
diff --git a/tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php b/tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php
@@ -1068,13 +1068,4 @@ public function testBug10228(): void
 		$this->analyse([__DIR__ . '/data/bug-10228.php'], []);
 	}
 
-	public function testBug9550(): void
-	{
-		$this->cliArgumentsVariablesRegistered = true;
-		$this->polluteScopeWithLoopInitialAssignments = false;
-		$this->checkMaybeUndefinedVariables = true;
-		$this->polluteScopeWithAlwaysIterableForeach = true;
-		$this->analyse([__DIR__ . '/data/bug-9550.php'], []);
-	}
-
 }
diff --git a/tests/PHPStan/Rules/Variables/data/bug-9550.php b/tests/PHPStan/Rules/Variables/data/bug-9550.php