Skip deep expression when root expression changes while scope generalization

Author: staabm

src/Analyser/MutatingScope.php

@@ -168,6 +168,7 @@
 use function strlen;
 use function strtolower;
 use function substr;
+use function uksort;
 use function usort;
 use const PHP_INT_MAX;
 use const PHP_INT_MIN;
@@ -5296,19 +5297,37 @@ private function generalizeVariableTypeHolders(
 		array $otherVariableTypeHolders,
 	): array
 	{
+		uksort($variableTypeHolders, static fn (string $exprA, string $exprB): int => strlen($exprA) <=> strlen($exprB));
+
+		$generalizedExpressions = [];
+		$newVariableTypeHolders = [];
 		foreach ($variableTypeHolders as $variableExprString => $variableTypeHolder) {
+			foreach ($generalizedExpressions as $generalizedExprString => $generalizedExpr) {
+				if (!$this->shouldInvalidateExpression($generalizedExprString, $generalizedExpr, $variableTypeHolder->getExpr())) {
+					continue;
+				}
+
+				continue 2;
+			}
 			if (!isset($otherVariableTypeHolders[$variableExprString])) {
+				$newVariableTypeHolders[$variableExprString] = $variableTypeHolder;
 				continue;
 			}
 
-			$variableTypeHolders[$variableExprString] = new ExpressionTypeHolder(
+			$generalizedType = $this->generalizeType($variableTypeHolder->getType(), $otherVariableTypeHolders[$variableExprString]->getType(), 0);
+			if (
+				!$generalizedType->equals($variableTypeHolder->getType())
+			) {
+				$generalizedExpressions[$variableExprString] = $variableTypeHolder->getExpr();
+			}
+			$newVariableTypeHolders[$variableExprString] = new ExpressionTypeHolder(
 				$variableTypeHolder->getExpr(),
-				$this->generalizeType($variableTypeHolder->getType(), $otherVariableTypeHolders[$variableExprString]->getType(), 0),
+				$generalizedType,
 				$variableTypeHolder->getCertainty(),
 			);
 		}
 
-		return $variableTypeHolders;
+		return $newVariableTypeHolders;
 	}
 
 	private function generalizeType(Type $a, Type $b, int $depth): Type

tests/PHPStan/Analyser/nsrt/pr-4390.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace PR4390;
+
+use function PHPStan\Testing\assertType;
+
+function (string $s): void {
+	$locations = [];
+	for ($i = 0; $i < 10; $i++) {
+		$locations[$i] = [];
+		for ($j = 0; $j < 10; $j++) {
+			$locations[$i][$j] = $s;
+		}
+	}
+
+	assertType('non-empty-array<int<0, 9>, non-empty-array<int<0, 9>, string>>', $locations);
+	assertType('non-empty-array<int<0, 9>, string>', $locations[0]);
+};