make polluteScopeWithAlwaysIterableForeach stricter for foreach key a…

…nd value
rajyan · Dec 7, 2022 · 4077165 · 4077165
1 parent 2b97645
commit 4077165
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -862,7 +862,11 @@ private function processStmtNode(
 					$finalScope = $finalScope->mergeWith($scope);
 				}
 			} elseif (!$this->polluteScopeWithAlwaysIterableForeach) {
-				$finalScope = $scope->processAlwaysIterableForeachScopeWithoutPollute($finalScope);
+				$finalScope = $scope->processAlwaysIterableForeachScopeWithoutPollute($finalScope)
+					->invalidateExpression($stmt->valueVar);
+				if ($stmt->keyVar !== null) {
+					$finalScope = $finalScope->invalidateExpression($stmt->keyVar);
+				}
 				// get types from finalScope, but don't create new variables
 			}
 

diff --git a/tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php b/tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php
@@ -514,23 +514,23 @@ public function dataForeachPolluteScopeWithAlwaysIterableForeach(): array
 						10,
 					],
 					[
-						'Variable $key might not be defined.',
+						'Undefined variable: $key',
 						19,
 					],
 					[
-						'Variable $val might not be defined.',
+						'Undefined variable: $val',
 						20,
 					],
 					[
 						'Variable $test might not be defined.',
 						21,
 					],
 					[
-						'Variable $key might not be defined.',
+						'Undefined variable: $key',
 						32,
 					],
 					[
-						'Variable $val might not be defined.',
+						'Undefined variable: $val',
 						33,
 					],
 					[
@@ -554,7 +554,7 @@ public function dataForeachPolluteScopeWithAlwaysIterableForeach(): array
 						62,
 					],
 					[
-						'Variable $key might not be defined.',
+						'Undefined variable: $key',
 						75,
 					],
 					[