fix that $methods[$className] is cleared in MutatingScope::$expressionTypes when the next loop iteration starts

Author: staabm

pr-4375.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace PR4375;
+
+use function PHPStan\debugScope;
+
+final class Foo
+{
+	public function processNode(): array
+	{
+		$methods = [];
+		foreach ($this->get() as $collected) {
+			foreach ($collected as [$className, $methodName, $classDisplayName]) {
+				$className = strtolower($className);
+
+				if (!array_key_exists($className, $methods)) {
+					$methods[$className] = [];
+				}
+				$methods[$className][strtolower($methodName)] = $classDisplayName . '::' . $methodName;
+			}
+		}
+
+		return [];
+	}
+
+	private function get(): array {
+		return [];
+	}
+}

src/Analyser/MutatingScope.php

@@ -4317,24 +4317,29 @@ public function specifyExpressionType(Expr $expr, Type $type, Type $nativeType,
 			&& !$expr->dim instanceof Expr\PostInc
 		) {
 			$dimType = $scope->getType($expr->dim)->toArrayKey();
-			if ($dimType instanceof ConstantIntegerType || $dimType instanceof ConstantStringType) {
+			if ($dimType->isInteger()->yes() || $dimType->isString()->yes()) {
 				$exprVarType = $scope->getType($expr->var);
 				if (!$exprVarType instanceof MixedType && !$exprVarType->isArray()->no()) {
 					$types = [
 						new ArrayType(new MixedType(), new MixedType()),
 						new ObjectType(ArrayAccess::class),
 						new NullType(),
 					];
-					if ($dimType instanceof ConstantIntegerType) {
+					if ($dimType->isInteger()->yes()) {
 						$types[] = new StringType();
 					}
+					$offsetValueType = TypeCombinator::intersect($exprVarType, TypeCombinator::union(...$types));
+
+					if ($dimType instanceof ConstantIntegerType || $dimType instanceof ConstantStringType) {
+						$offsetValueType = TypeCombinator::intersect(
+							$offsetValueType,
+							new HasOffsetValueType($dimType, $type),
+						);
+					}
 
 					$scope = $scope->specifyExpressionType(
 						$expr->var,
-						TypeCombinator::intersect(
-							TypeCombinator::intersect($exprVarType, TypeCombinator::union(...$types)),
-							new HasOffsetValueType($dimType, $type),
-						),
+						$offsetValueType,
 						$scope->getNativeType($expr->var),
 						$certainty,
 					);

src/Analyser/NodeScopeResolver.php

@@ -4523,37 +4523,50 @@ private function getThrowPointsFromPropertyHook(
 	}
 
 	/**
-	 * @return string[]
+	 * @return Expr[]
 	 */
-	private function getAssignedVariables(Expr $expr): array
+	private function getAssignedExpressions(Expr $expr): array
 	{
 		if ($expr instanceof Expr\Variable) {
-			if (is_string($expr->name)) {
-				return [$expr->name];
-			}
-
-			return [];
+			return [$expr];
 		}
 
 		if ($expr instanceof Expr\List_) {
-			$names = [];
+			$expressions = [];
 			foreach ($expr->items as $item) {
 				if ($item === null) {
 					continue;
 				}
 
-				$names = array_merge($names, $this->getAssignedVariables($item->value));
+				$expressions[] = $item->value;
 			}
 
-			return $names;
+			return $expressions;
 		}
 
 		if ($expr instanceof ArrayDimFetch) {
-			return $this->getAssignedVariables($expr->var);
+			return $this->getAssignedExpressions($expr->var);
 		}
 
 		return [];
 	}
+	/**
+	 * @return string[]
+	 */
+	private function getAssignedVariables(Expr $expr): array
+	{
+		$varNames = [];
+
+		foreach($this->getAssignedExpressions($expr) as $expression) {
+			if ($expression instanceof Expr\Variable) {
+				if (is_string($expression->name)) {
+					$varNames[] = $expression->name;
+				}
+			}
+		}
+
+		return $varNames;
+	}
 
 	/**
 	 * @param callable(Node $node, Scope $scope): void $nodeCallback
@@ -6471,6 +6484,10 @@ private function processVarAnnotation(MutatingScope $scope, array $variableNames
 	 */
 	private function enterForeach(MutatingScope $scope, MutatingScope $originalScope, Foreach_ $stmt, callable $nodeCallback): MutatingScope
 	{
+		foreach($this->getAssignedExpressions($stmt->valueVar) as $expr) {
+			$scope = $scope->invalidateExpression($expr);
+		}
+
 		if ($stmt->expr instanceof Variable && is_string($stmt->expr->name)) {
 			$scope = $this->processVarAnnotation($scope, [$stmt->expr->name], $stmt);
 		}