feat: use isOffsetAccessLegal in NonexistentOffsetInArrayDimFetchRule

phpstan · May 5, 2024 · b81633f · b81633f
1 parent 5277d55
commit b81633f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Rules/Arrays/NonexistentOffsetInArrayDimFetchRule.php b/src/Rules/Arrays/NonexistentOffsetInArrayDimFetchRule.php
@@ -64,7 +64,7 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if ($scope->isUndefinedExpressionAllowed($node) && !$isOffsetAccessible->no()) {
+		if ($scope->isUndefinedExpressionAllowed($node) && $isOffsetAccessibleType->isOffsetAccessLegal()->yes()) {
 			return [];
 		}
 

diff --git a/tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php b/tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php
@@ -115,6 +115,10 @@ public function testRule(): void
 				'Cannot access offset \'a\' on Closure(): void.',
 				253,
 			],
+			[
+				'Cannot access offset \'a\' on array{a: 1, b: 1}|(Closure(): void).',
+				258,
+			],
 			[
 				'Offset null does not exist on array<int, string>.',
 				310,
@@ -252,6 +256,10 @@ public function testRuleBleedingEdge(): void
 				'Cannot access offset \'a\' on Closure(): void.',
 				253,
 			],
+			[
+				'Cannot access offset \'a\' on array{a: 1, b: 1}|(Closure(): void).',
+				258,
+			],
 			[
 				'Offset null does not exist on array<int, string>.',
 				310,