Remember assigned offset value on general arrays

ondrejmirtes · ondrejmirtes · commit 0f64ca749f52 · 2021-02-19T17:21:42.000+01:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -2651,6 +2651,7 @@ private function processAssignVar(
 			}
 		} elseif ($var instanceof ArrayDimFetch) {
 			$dimExprStack = [];
+			$originalVar = $var;
 			while ($var instanceof ArrayDimFetch) {
 				$dimExprStack[] = $var->dim;
 				$var = $var->var;
@@ -2690,6 +2691,7 @@ private function processAssignVar(
 			}
 
 			$valueToWrite = $scope->getType($assignedExpr);
+			$originalValueToWrite = $valueToWrite;
 
 			// 3. eval assigned expr
 			$result = $processExprCallback($scope);
@@ -2734,6 +2736,16 @@ private function processAssignVar(
 						$valueToWrite
 					);
 				}
+
+				if ($originalVar->dim instanceof Variable) {
+					$currentVarType = $scope->getType($originalVar);
+					if (!$originalValueToWrite->isSuperTypeOf($currentVarType)->yes()) {
+						$scope = $scope->assignExpression(
+							$originalVar,
+							$originalValueToWrite
+						);
+					}
+				}
 			}
 		} elseif ($var instanceof PropertyFetch) {
 			$this->processExprNode($var->var, $scope, $nodeCallback, $context);
diff --git a/src/Type/FileTypeMapper.php b/src/Type/FileTypeMapper.php
@@ -111,7 +111,6 @@ public function getResolvedPhpDoc(
 			$this->inProcess[$fileName][$phpDocKey] = $resolveCallback();
 		}
 
-		assert($this->inProcess[$fileName][$phpDocKey] instanceof NameScopedPhpDocString);
 		return $this->createResolvedPhpDocBlock($phpDocKey, $this->inProcess[$fileName][$phpDocKey], $fileName);
 	}
 
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -10872,6 +10872,11 @@ public function dataInferArrayKey(): array
 		return $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/infer-array-key.php');
 	}
 
+	public function dataOffsetValueTypeAfterAssign(): array
+	{
+		return $this->gatherAssertTypes(__DIR__ . '/data/offset-value-after-assign.php');
+	}
+
 	/**
 	 * @param string $file
 	 * @return array<string, mixed[]>
@@ -11108,6 +11113,7 @@ private function gatherAssertTypes(string $file): array
 	 * @dataProvider dataBug3024
 	 * @dataProvider dataBug3134
 	 * @dataProvider dataInferArrayKey
+	 * @dataProvider dataOffsetValueTypeAfterAssign
 	 * @param string $assertType
 	 * @param string $file
 	 * @param mixed ...$args
diff --git a/tests/PHPStan/Analyser/data/offset-value-after-assign.php b/tests/PHPStan/Analyser/data/offset-value-after-assign.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace OffsetValueAfterAssign;
+
+use function PHPStan\Analyser\assertType;
+
+class Foo
+{
+
+	/**
+	 * @param array<string> $a
+	 */
+	public function doFoo(array $a, int $i): void
+	{
+		assertType('string', $a[$i]);
+
+		$a[$i] = 'foo';
+		assertType('\'foo\'', $a[$i]);
+
+		$i = 1;
+		assertType('string', $a[$i]);
+	}
+
+}
diff --git a/tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php b/tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php
@@ -399,10 +399,10 @@ public function testBug3997(): void
 	public function testBug1903(): void
 	{
 		$this->analyse([__DIR__ . '/data/bug-1903.php'], [
-			/*[
+			[
 				'Method Bug1903\Test::doFoo() should return array but returns int.',
 				19,
-			],*/
+			],
 		]);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,6 @@ public function getResolvedPhpDoc(`
`111`	`111`	`$this->inProcess[$fileName][$phpDocKey] = $resolveCallback();`
`112`	`112`	`}`
`113`	`113`
`114`		`- assert($this->inProcess[$fileName][$phpDocKey] instanceof NameScopedPhpDocString);`
`115`	`114`	`return $this->createResolvedPhpDocBlock($phpDocKey, $this->inProcess[$fileName][$phpDocKey], $fileName);`
`116`	`115`	`}`
`117`	`116`
Original file line number	Diff line number	Diff line change
`@@ -399,10 +399,10 @@ public function testBug3997(): void`
`399`	`399`	`public function testBug1903(): void`
`400`	`400`	`{`
`401`	`401`	`$this->analyse([__DIR__ . '/data/bug-1903.php'], [`
`402`		`- /*[`
	`402`	`+ [`
`403`	`403`	`'Method Bug1903\Test::doFoo() should return array but returns int.',`
`404`	`404`	`19,`
`405`		`- ],*/`
	`405`	`+ ],`
`406`	`406`	`]);`
`407`	`407`	`}`
`408`	`408`