Make array access on possible false tolerant with isset

phpstan · Oct 4, 2022 · 20f044e · 20f044e
1 parent 8462fbd
commit 20f044e
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 11 deletions.
diff --git a/src/Rules/Arrays/NonexistentOffsetInArrayDimFetchRule.php b/src/Rules/Arrays/NonexistentOffsetInArrayDimFetchRule.php
@@ -56,7 +56,11 @@ public function processNode(Node $node, Scope $scope): array
 
 		$isOffsetAccessible = $isOffsetAccessibleType->isOffsetAccessible();
 
-		if (($scope->isInExpressionAssign($node) || $scope->isUndefinedExpressionAllowed($node)) && $isOffsetAccessible->yes()) {
+		if ($scope->isInExpressionAssign($node) && $isOffsetAccessible->yes()) {
+			return [];
+		}
+
+		if ($scope->isUndefinedExpressionAllowed($node) && !$isOffsetAccessible->no()) {
 			return [];
 		}
 

diff --git a/tests/PHPStan/Levels/data/arrayDimFetches-7.json b/tests/PHPStan/Levels/data/arrayDimFetches-7.json
@@ -28,10 +28,5 @@
         "message": "Cannot access offset 'foo' on iterable<int|string, object>.",
         "line": 58,
         "ignorable": true
-    },
-    {
-        "message": "Cannot access offset 'foo' on iterable<int|string, object>.",
-        "line": 66,
-        "ignorable": true
     }
-]
+]
diff --git a/tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php b/tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php
@@ -111,10 +111,6 @@ 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 string does not exist on array<int, string>.',
 				308,
@@ -538,4 +534,14 @@ public function testBug8097(): void
 		$this->analyse([__DIR__ . '/data/bug-8097.php'], []);
 	}
 
+	public function testBug8068(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-8068.php'], [
+			[
+				"Cannot access offset 'path' on Closure.",
+				18,
+			],
+		]);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Arrays/data/bug-8068.php b/tests/PHPStan/Rules/Arrays/data/bug-8068.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Bug8097;
+
+use Closure;
+
+class HelloWorld
+{
+	public function test(string $url): bool
+	{
+		$urlParsed = parse_url($url);
+
+		return isset($urlParsed['path']);
+	}
+
+	public function test2(Closure $closure): bool
+	{
+		return isset($closure['path']);
+	}
+
+	/**
+	 * @param iterable<int|string, object> $iterable
+	 */
+	public function test3($iterable): bool
+	{
+		unset($iterable['path']);
+	}
+}