Fix false positives on existing offsets after assign

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -5480,8 +5480,7 @@ private function processAssignVar(
 				}
 
 				if ($originalVar->dim instanceof Variable || $originalVar->dim instanceof Node\Scalar) {
-					$currentVarType = $scope->getType($originalVar);
-					if (!$originalValueToWrite->isSuperTypeOf($currentVarType)->yes()) {
+					if (!$scope->hasExpressionType($originalVar)->yes()) {
 						$scope = $scope->assignExpression(
 							$originalVar,
 							$originalValueToWrite,

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -208,6 +208,7 @@ private static function findTestFiles(): iterable
 		yield __DIR__ . '/../Rules/Classes/data/bug-11591-property-tag.php';
 		yield __DIR__ . '/../Rules/Classes/data/mixin-trait-use.php';
 
+		yield __DIR__ . '/../Rules/Arrays/data/bug-11679.php';
 		yield __DIR__ . '/../Rules/Methods/data/bug-4801.php';
 	}
 

tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php

@@ -849,6 +849,20 @@ public function testArrayDimFetchOnArrayKeyFirsOrLastOrCount(): void
 		]);
 	}
 
+	public function testBug12406(): void
+	{
+		$this->reportPossiblyNonexistentGeneralArrayOffset = true;
+
+		$this->analyse([__DIR__ . '/data/bug-12406.php'], []);
+	}
+
+	public function testBug11679(): void
+	{
+		$this->reportPossiblyNonexistentGeneralArrayOffset = true;
+
+		$this->analyse([__DIR__ . '/data/bug-11679.php'], []);
+	}
+
 	public function testBug8649(): void
 	{
 		$this->reportPossiblyNonexistentGeneralArrayOffset = true;

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

@@ -0,0 +1,39 @@
+<?php
+
+namespace Bug11679;
+
+use function PHPStan\Testing\assertType;
+
+class WorkingExample
+{
+	/** @var array{foo?: bool} */
+	private array $arr = [];
+
+	public function sayHello(): bool
+	{
+		assertType('array{foo?: bool}', $this->arr);
+		if (!isset($this->arr['foo'])) {
+			$this->arr['foo'] = true;
+			assertType('array{foo: true}', $this->arr);
+		}
+		assertType('array{foo: bool}', $this->arr);
+		return $this->arr['foo']; // PHPStan realizes optional 'foo' is set
+	}
+}
+
+class NonworkingExample
+{
+	/** @var array<int, array{foo?: bool}> */
+	private array $arr = [];
+
+	public function sayHello(int $index): bool
+	{
+		assertType('array<int, array{foo?: bool}>', $this->arr);
+		if (!isset($this->arr[$index]['foo'])) {
+			$this->arr[$index]['foo'] = true;
+			assertType('non-empty-array<int, array{foo: true}>', $this->arr);
+		}
+		assertType('array<int, array{foo?: bool}>', $this->arr);
+		return $this->arr[$index]['foo']; // PHPStan does not realize 'foo' is set
+	}
+}

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

@@ -0,0 +1,15 @@
+<?php
+
+namespace Bug12406;
+
+final class HelloWorld
+{
+	/** @var array<string, int> */
+	protected array $words = [];
+
+	public function sayHello(string $word, int $count): void
+	{
+		$this->words[$word] ??= 0;
+		$this->words[$word] += $count;
+	}
+}