Skip to content

Commit 830b6d5

Browse files
authored
Merge branch refs/heads/1.12.x into 2.0.x
2 parents 3155acd + 7869053 commit 830b6d5

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/Analyser/NodeScopeResolver.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5073,10 +5073,10 @@ private function processAssignVar(
50735073

50745074
$valueToWrite = $this->produceArrayDimFetchAssignValueToWrite($offsetTypes, $offsetValueType, $valueToWrite);
50755075

5076-
$nativeValueToWrite = $valueToWrite;
50775076
if (!$offsetValueType->equals($offsetNativeValueType) || !$valueToWrite->equals($nativeValueToWrite)) {
50785077
$nativeValueToWrite = $this->produceArrayDimFetchAssignValueToWrite($offsetNativeTypes, $offsetNativeValueType, $nativeValueToWrite);
50795078
} else {
5079+
$rewritten = false;
50805080
foreach ($offsetTypes as $i => $offsetType) {
50815081
$offsetNativeType = $offsetNativeTypes[$i];
50825082
if ($offsetType === null) {
@@ -5093,8 +5093,13 @@ private function processAssignVar(
50935093
}
50945094

50955095
$nativeValueToWrite = $this->produceArrayDimFetchAssignValueToWrite($offsetNativeTypes, $offsetNativeValueType, $nativeValueToWrite);
5096+
$rewritten = true;
50965097
break;
50975098
}
5099+
5100+
if (!$rewritten) {
5101+
$nativeValueToWrite = $valueToWrite;
5102+
}
50985103
}
50995104

51005105
if ($varType->isArray()->yes() || !(new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->yes()) {

0 commit comments

Comments
 (0)