fix

Author: staabm

src/Analyser/MutatingScope.php

@@ -162,12 +162,14 @@
 use function ltrim;
 use function md5;
 use function sprintf;
+use function str_contains;
 use function str_decrement;
 use function str_increment;
 use function str_starts_with;
 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,30 +5298,28 @@ private function generalizeVariableTypeHolders(
 		array $otherVariableTypeHolders,
 	): array
 	{
-		$sortByExprStringLength = static function (string $exprA, string $exprB): int {
-			return strlen($exprA) <=> strlen($exprB);
-		};
-
-		uksort($variableTypeHolders, $sortByExprStringLength);
-		uksort($otherVariableTypeHolders, $sortByExprStringLength);
+		uksort($variableTypeHolders, static fn (string $exprA, string $exprB): int => strlen($exprA) <=> strlen($exprB));
 
 		$changedArrays = [];
 		foreach ($variableTypeHolders as $variableExprString => $variableTypeHolder) {
 			if (!isset($otherVariableTypeHolders[$variableExprString])) {
 				continue;
 			}
 
-			foreach($changedArrays as $changedExpr) {
-				if (str_starts_with($variableExprString, $changedExpr)) {
+			foreach ($changedArrays as $changedExpr) {
+				if (
+					str_contains($variableExprString, $changedExpr . '[')
+					|| str_contains($variableExprString, '[' . $changedExpr . ']')
+				) {
+					unset($variableTypeHolders[$variableExprString]);
 					continue 2;
 				}
 			}
 
 			$generalizedType = $this->generalizeType($variableTypeHolder->getType(), $otherVariableTypeHolders[$variableExprString]->getType(), 0);
 			if (
-				$generalizedType->isArray()->yes() &&
-				!$generalizedType->equals($variableTypeHolder->getType()))
-			{
+				!$generalizedType->equals($variableTypeHolder->getType())
+			) {
 				$changedArrays[] = $variableExprString;
 			}
 			$variableTypeHolders[$variableExprString] = new ExpressionTypeHolder(

tests/PHPStan/Analyser/nsrt/pr-4372.php renamed to tests/PHPStan/Analyser/nsrt/pr-4390.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PR4372;
+namespace PR4390;
 
 use function PHPStan\debugScope;
 use function PHPStan\Testing\assertType;
@@ -15,5 +15,5 @@ function (string $s): void {
 	}
 
 	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]);
+	assertType('non-empty-array<int<0, 9>, string>', $locations[0]);
 };