assert all branches

Author: staabm

tests/PHPStan/Analyser/nsrt/array-find-key-existing.php

@@ -14,8 +14,16 @@ function arrayFindKeyNotNull(array $list, string $s): void
 	$key = array_find_key($list, fn (string $v) => $v === $s);
 	if ($key !== null) {
 		assertType('non-empty-list<string>', $list);
+		assertType('int<0, max>', $key);
 		assertType('string', $list[$key]);
+	} else {
+		assertType('array{}', $list);
+		assertType('null', $key);
+		assertType('*ERROR*', $list[$key]);
 	}
+	assertType('list<string>', $list);
+	assertType('int<0, max>|null', $key);
+	assertType('string', $list[$key]);
 }
 
 /**

tests/PHPStan/Analyser/nsrt/array-search-existing.php

@@ -45,8 +45,18 @@ function arraySearchStrictNarrowsToNeedle(array $arr, int $needle): void
 {
 	$key = array_search($needle, $arr, true);
 	if ($key !== false) {
+		assertType('non-empty-array<string, int|string>', $arr);
+		assertType('string', $key);
 		assertType('int', $arr[$key]);
+	} else {
+		assertType('array<string, int|string>', $arr);
+		assertType('false', $key);
+		assertType('*ERROR*', $arr[$key]);
 	}
+	assertType('array<string, int|string>', $arr);
+	assertType('string|false', $key);
+	assertType('int|string', $arr[$key]);
+
 }
 
 /**

tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php

@@ -1309,15 +1309,33 @@ public function testArraySearchExisting(): void
 	{
 		$this->reportPossiblyNonexistentGeneralArrayOffset = true;
 
-		$this->analyse([__DIR__ . '/../../Analyser/nsrt/array-search-existing.php'], []);
+		$this->analyse([__DIR__ . '/../../Analyser/nsrt/array-search-existing.php'], [
+			[
+				'Offset false does not exist on array<string, int|string>.',
+				54,
+			],
+			[
+				'Offset string|false might not exist on array<string, int|string>.',
+				58,
+			],
+		]);
 	}
 
 	#[RequiresPhp('>= 8.4.0')]
 	public function testArrayFindKeyExisting(): void
 	{
 		$this->reportPossiblyNonexistentGeneralArrayOffset = true;
 
-		$this->analyse([__DIR__ . '/../../Analyser/nsrt/array-find-key-existing.php'], []);
+		$this->analyse([__DIR__ . '/../../Analyser/nsrt/array-find-key-existing.php'], [
+			[
+				'Offset null does not exist on array{}.',
+				22,
+			],
+			[
+				'Offset int<0, max>|null might not exist on list<string>.',
+				26,
+			],
+		]);
 	}
 
 }