fix

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -6146,6 +6146,8 @@ private function isImplicitArrayCreation(array $dimFetchStack, Scope $scope): Tr
 	 */
 	private function produceArrayDimFetchAssignValueToWrite(array $dimFetchStack, array $offsetTypes, Type $offsetValueType, Type $valueToWrite, Scope $scope, array &$additionalExpressions = []): Type
 	{
+		$originalValueToWrite = $valueToWrite;
+
 		$offsetValueTypeStack = [$offsetValueType];
 		foreach (array_slice($offsetTypes, 0, -1) as $offsetType) {
 			if ($offsetType === null) {
@@ -6234,7 +6236,12 @@ private function produceArrayDimFetchAssignValueToWrite(array $dimFetchStack, ar
 			}
 		}
 
-		if (count($dimFetchStack) > 1) {
+		if (count($dimFetchStack) === 1) {
+			$dimFetch = $dimFetchStack[0];
+			if ($dimFetch->dim !== null) {
+				$additionalExpressions[] = [$dimFetchStack[0], $originalValueToWrite];
+			}
+		} else {
 			$offsetValueType = $valueToWrite;
 			foreach ($dimFetchStack as $dimFetch) {
 				if ($dimFetch->dim === null) {
@@ -6243,12 +6250,10 @@ private function produceArrayDimFetchAssignValueToWrite(array $dimFetchStack, ar
 				}
 
 				$offsetType = $scope->getType($dimFetch->dim);
-				if (!$offsetValueType->hasOffsetValueType($offsetType)->yes()) {
-					$additionalExpressions = [];
-					break;
-				}
-
 				$offsetValueType = $offsetValueType->getOffsetValueType($offsetType);
+				if ($offsetValueType instanceof ErrorType) {
+					$offsetValueType = new ConstantArrayType([], []);
+				}
 				$additionalExpressions[] = [$dimFetch, $offsetValueType];
 			}
 		}

tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php

@@ -1021,34 +1021,6 @@ public function testBug13538(): void
 				"Offset int might not exist on non-empty-array<int, ''>.",
 				17,
 			],
-			[
-				"Offset int might not exist on non-empty-array<int, ''>.",
-				21,
-			],
-			[
-				"Offset int might not exist on non-empty-array<int, ''>.",
-				25,
-			],
-			[
-				"Offset int might not exist on non-empty-array<int, ''>.",
-				41,
-			],
-			[
-				"Offset int might not exist on non-empty-array<int, ''>.",
-				45,
-			],
-			[
-				"Offset int might not exist on non-empty-array<int, ''>.",
-				49,
-			],
-			[
-				"Offset string might not exist on non-empty-array<string, ''>.",
-				68,
-			],
-			[
-				"Offset int might not exist on non-empty-array<int, non-empty-array<string, ''>>.",
-				68,
-			],
 		]);
 	}
 

tests/PHPStan/Rules/Arrays/data/bug-13538.php

@@ -57,9 +57,5 @@ function doBar(array $arr, int $i, string $s): void
 		assertType("non-empty-array<string, ''>", $logs[$i]);
 		assertType("''", $logs[$i][$s]);
 		echo $logs[$i][$s];
-
-		$i++;
-
-		echo $logs[$i][$s];
 	}
 }