assert types

Author: staabm

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -98,6 +98,7 @@ private static function findTestFiles(): iterable
 		yield __DIR__ . '/../Rules/Generics/data/bug-3769.php';
 		yield __DIR__ . '/../Rules/Generics/data/bug-6301.php';
 		yield __DIR__ . '/../Rules/PhpDoc/data/bug-4643.php';
+		yield __DIR__ . '/../Rules/Arrays/data/bug-13538.php';
 
 		if (PHP_VERSION_ID >= 80000) {
 			yield __DIR__ . '/../Rules/Comparison/data/bug-4857.php';

tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php

@@ -1005,7 +1005,36 @@ public function testBug13538(): void
 		$this->reportPossiblyNonexistentConstantArrayOffset = true;
 		$this->reportPossiblyNonexistentGeneralArrayOffset = true;
 
-		$this->analyse([__DIR__ . '/data/bug-13538.php'], []);
+		$this->analyse([__DIR__ . '/data/bug-13538.php'], [
+			[
+				"Offset int might not exist on non-empty-array<int, ''>.",
+				13,
+			],
+			[
+				"Offset int might not exist on non-empty-array<int, ''>.",
+				17,
+			],
+			[
+				"Offset int might not exist on non-empty-array<int, ''>.",
+				21,
+			],
+			[
+				"Offset int might not exist on non-empty-array<int, ''>.",
+				25,
+			],
+			[
+				"Offset int might not exist on non-empty-array<int, ''>.",
+				41,
+			],
+			[
+				"Offset int might not exist on non-empty-array<int, ''>.",
+				45,
+			],
+			[
+				"Offset int might not exist on non-empty-array<int, ''>.",
+				49,
+			],
+		]);
 	}
 
 }

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

@@ -3,36 +3,64 @@
 namespace Bug13538;
 
 use LogicException;
+use function PHPStan\Testing\assertType;
 
 /** @param list<string> $arr */
-function doFoo(array $arr, string $s): void
+function doFoo(array $arr, int $i, int $i2): void
 {
 	$logs = [];
-	$logs[$s] = '';
+	$logs[$i] = '';
+	echo $logs[$i2];
+
+	assertType("non-empty-array<int, ''>", $logs);
+	assertType("''", $logs[$i]);
+	assertType("string", $logs[$i2]);
+
 	foreach ($arr as $value) {
-		echo $logs[$s];
+		echo $logs[$i];
+		echo $logs[$i2];
+
+		assertType("non-empty-array<int, ''>", $logs);
+		assertType("''", $logs[$i]);
+		assertType("string", $logs[$i2]);
 	}
 }
 
 /** @param list<string> $arr */
-function doFooBar(array $arr): void
+function doFooBar(array $arr, int $i): void
 {
 	if (!defined('LOG_DIR')) {
 		throw new LogicException();
 	}
 
 	$logs = [];
 	$logs[LOG_DIR] = '';
+
+	assertType("non-empty-array<''>", $logs);
+	assertType("''", $logs[LOG_DIR]);
+	assertType("string", $logs[$i]);
+
 	foreach ($arr as $value) {
 		echo $logs[LOG_DIR];
+		echo $logs[$i];
+
+		assertType("non-empty-array<''>", $logs);
+		assertType("''", $logs[LOG_DIR]);
+		assertType("string", $logs[$i]);
 	}
 }
 
 function doBar(array $arr, int $i, string $s): void
 {
 	$logs = [];
 	$logs[$i][$s] = '';
+	assertType("non-empty-array<int, non-empty-array<string, ''>>", $logs);
+	assertType("non-empty-array<string, ''>", $logs[$i]);
+	assertType("''", $logs[$i][$s]);
 	foreach ($arr as $value) {
+		assertType("non-empty-array<int, non-empty-array<string, ''>>", $logs);
+		assertType("non-empty-array<string, ''>", $logs[$i]);
+		assertType("''", $logs[$i][$s]);
 		echo $logs[$i][$s];
 	}
 }