Rework

Author: VincentLanglet

src/Rules/Arrays/NonexistentOffsetInArrayDimFetchCheck.php

@@ -76,6 +76,7 @@ public function check(
 			} else {
 				$flattenedTypes = TypeUtils::flattenTypes($type);
 			}
+
 			foreach ($flattenedTypes as $innerType) {
 				if (
 					$this->reportPossiblyNonexistentGeneralArrayOffset
@@ -95,9 +96,11 @@ public function check(
 					break;
 				}
 				if ($dimType instanceof UnionType) {
-					if ($innerType->hasOffsetValueType($dimType)->no()) {
-						$report = true;
-						break;
+					foreach ($dimType->getTypes() as $subDimType) {
+						if ($innerType->hasOffsetValueType($subDimType)->no()) {
+							$report = true;
+							break 2;
+						}
 					}
 					continue;
 				}

tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php

@@ -119,6 +119,10 @@ public function testRule(): void
 				'Cannot access offset \'a\' on array{a: 1, b: 1}|(Closure(): void).',
 				258,
 			],
+			[
+				'Offset int|null might not exist on array<int, string>.',
+				309,
+			],
 			[
 				'Offset null does not exist on array<int, string>.',
 				310,
@@ -127,6 +131,10 @@ public function testRule(): void
 				'Offset int does not exist on array<string, string>.',
 				312,
 			],
+			[
+				' Offset int|null might not exist on array<string, string>.',
+				314,
+			],
 			[
 				'Offset \'baz\' might not exist on array{bar: 1, baz?: 2}.',
 				344,
@@ -185,6 +193,10 @@ public function testStrings(): void
 				'Offset 12.34 does not exist on \'foo\'.',
 				13,
 			],
+			[
+				"Offset int|object might not exist on 'foo'.",
+				16,
+			],
 			[
 				'Offset \'foo\' might not exist on array|string.',
 				24,
@@ -193,6 +205,10 @@ public function testStrings(): void
 				'Offset 12.34 might not exist on array|string.',
 				28,
 			],
+			[
+				'Offset int|object might not exist on array|string.',
+				32,
+			],
 		]);
 	}
 
@@ -928,8 +944,6 @@ public function testBug3747(): void
 
 	public function testBug1061(): void
 	{
-		$this->reportPossiblyNonexistentConstantArrayOffset = true;
-
 		$this->analyse([__DIR__ . '/data/bug-1061.php'], [
 			[
 				"Offset 'one'|'two' might not exist on array{two: 1, three: 2}.",