Merge branch refs/heads/1.12.x into 2.0.x

phpstan · Oct 26, 2024 · 830b6d5 · 830b6d5
2 parents 3155acd + 7869053
commit 830b6d5
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -5073,10 +5073,10 @@ private function processAssignVar(
 
 			$valueToWrite = $this->produceArrayDimFetchAssignValueToWrite($offsetTypes, $offsetValueType, $valueToWrite);
 
-			$nativeValueToWrite = $valueToWrite;
 			if (!$offsetValueType->equals($offsetNativeValueType) || !$valueToWrite->equals($nativeValueToWrite)) {
 				$nativeValueToWrite = $this->produceArrayDimFetchAssignValueToWrite($offsetNativeTypes, $offsetNativeValueType, $nativeValueToWrite);
 			} else {
+				$rewritten = false;
 				foreach ($offsetTypes as $i => $offsetType) {
 					$offsetNativeType = $offsetNativeTypes[$i];
 					if ($offsetType === null) {
@@ -5093,8 +5093,13 @@ private function processAssignVar(
 					}
 
 					$nativeValueToWrite = $this->produceArrayDimFetchAssignValueToWrite($offsetNativeTypes, $offsetNativeValueType, $nativeValueToWrite);
+					$rewritten = true;
 					break;
 				}
+
+				if (!$rewritten) {
+					$nativeValueToWrite = $valueToWrite;
+				}
 			}
 
 			if ($varType->isArray()->yes() || !(new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->yes()) {