Specify existent offset with key variable when entering foreach

ondrejmirtes · ondrejmirtes · commit 14592ddf2b9d · 2022-08-22T16:04:05.000+02:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -3143,6 +3143,13 @@ public function enterForeachKey(Expr $iteratee, string $keyName): self
 		$scope = $this->assignVariable($keyName, $iterateeType->getIterableKeyType());
 		$scope->nativeExpressionTypes[sprintf('$%s', $keyName)] = $nativeIterateeType->getIterableKeyType();
 
+		if ($iterateeType->isArray()->yes()) {
+			$scope = $scope->specifyExpressionType(
+				new Expr\ArrayDimFetch($iteratee, new Variable($keyName)),
+				$iterateeType->getIterableValueType(),
+			);
+		}
+
 		return $scope;
 	}
 
diff --git a/tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php b/tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php
@@ -429,12 +429,7 @@ public function testBug7142(): void
 	public function testBug6000(): void
 	{
 		$this->checkExplicitMixed = true;
-		$this->analyse([__DIR__ . '/data/bug-6000.php'], [
-			[
-				'Offset \'classmap\' does not exist on array{psr-4?: array<string, array<string>|string>, classmap?: array<int, string>}.',
-				12,
-			],
-		]);
+		$this->analyse([__DIR__ . '/data/bug-6000.php'], []);
 	}
 
 	public function testBug5743(): void
@@ -508,4 +503,9 @@ public function testBug7763(): void
 		$this->analyse([__DIR__ . '/data/bug-7763.php'], []);
 	}
 
+	public function testSpecifyExistentOffsetWhenEnteringForeach(): void
+	{
+		$this->analyse([__DIR__ . '/data/specify-existent-offset-when-entering-foreach.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Arrays/data/specify-existent-offset-when-entering-foreach.php b/tests/PHPStan/Rules/Arrays/data/specify-existent-offset-when-entering-foreach.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace SpecifyExistentOffsetWhenEnteringForeach;
+
+class Foo
+{
+
+	public function doFoo(string $s): void
+	{
+		$hintsToFind = ['ext-' => 0, 'lib-' => 0, 'php' => 99, 'composer' => 99];
+		foreach ($hintsToFind as $hintPrefix => $hintCount) {
+			if (str_starts_with($s, $hintPrefix)) {
+				if ($hintCount === 0 || $hintCount >= 99) {
+					$hintsToFind[$hintPrefix]++;
+				} elseif ($hintCount === 1) {
+					unset($hintsToFind[$hintPrefix]);
+				}
+			}
+		}
+	}
+
+}
diff --git a/tests/PHPStan/Rules/Functions/ImplodeFunctionRuleTest.php b/tests/PHPStan/Rules/Functions/ImplodeFunctionRuleTest.php
@@ -50,7 +50,13 @@ public function testFile(): void
 
 	public function testBug6000(): void
 	{
-		$this->analyse([__DIR__ . '/../Arrays/data/bug-6000.php'], []);
+		$this->analyse([__DIR__ . '/../Arrays/data/bug-6000.php'], [
+			[
+				// shouldn't be happening...
+				'Parameter #2 $array of function implode expects array<string>, array<int|string, array<string>|string> given.',
+				12,
+			],
+		]);
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -429,12 +429,7 @@ public function testBug7142(): void`
`429`	`429`	`public function testBug6000(): void`
`430`	`430`	`{`
`431`	`431`	`$this->checkExplicitMixed = true;`
`432`		`- $this->analyse([__DIR__ . '/data/bug-6000.php'], [`
`433`		`- [`
`434`		`- 'Offset \'classmap\' does not exist on array{psr-4?: array<string, array<string>\|string>, classmap?: array<int, string>}.',`
`435`		`- 12,`
`436`		`- ],`
`437`		`- ]);`
	`432`	`+ $this->analyse([__DIR__ . '/data/bug-6000.php'], []);`
`438`	`433`	`}`
`439`	`434`
`440`	`435`	`public function testBug5743(): void`
`@@ -508,4 +503,9 @@ public function testBug7763(): void`
`508`	`503`	`$this->analyse([__DIR__ . '/data/bug-7763.php'], []);`
`509`	`504`	`}`
`510`	`505`
	`506`	`+ public function testSpecifyExistentOffsetWhenEnteringForeach(): void`
	`507`	`+ {`
	`508`	`+ $this->analyse([__DIR__ . '/data/specify-existent-offset-when-entering-foreach.php'], []);`
	`509`	`+ }`
	`510`	`+`
`511`	`511`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,13 @@ public function testFile(): void`
`50`	`50`
`51`	`51`	`public function testBug6000(): void`
`52`	`52`	`{`
`53`		`- $this->analyse([__DIR__ . '/../Arrays/data/bug-6000.php'], []);`
	`53`	`+ $this->analyse([__DIR__ . '/../Arrays/data/bug-6000.php'], [`
	`54`	`+ [`
	`55`	`+ // shouldn't be happening...`
	`56`	`+ 'Parameter #2 $array of function implode expects array<string>, array<int\|string, array<string>\|string> given.',`
	`57`	`+ 12,`
	`58`	`+ ],`
	`59`	`+ ]);`
`54`	`60`	`}`
`55`	`61`
`56`	`62`	`}`