testBug7229 - reflect real state

ondrejmirtes · ondrejmirtes · commit c37fb1e3cb19 · 2022-05-21T09:18:26.000+02:00
diff --git a/src/Rules/Arrays/NonexistentOffsetInArrayDimFetchRule.php b/src/Rules/Arrays/NonexistentOffsetInArrayDimFetchRule.php
@@ -56,10 +56,7 @@ public function processNode(Node $node, Scope $scope): array
 
 		$isOffsetAccessible = $isOffsetAccessibleType->isOffsetAccessible();
 
-		if (
-			$scope->isInExpressionAssign($node) && $isOffsetAccessible->yes()
-			|| ($scope->isUndefinedExpressionAllowed($node) || $scope->isSpecified($node)) && !$isOffsetAccessible->no()
-		) {
+		if (($scope->isInExpressionAssign($node) || $scope->isUndefinedExpressionAllowed($node)) && $isOffsetAccessible->yes()) {
 			return [];
 		}
 
@@ -86,7 +83,7 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if ($dimType === null) {
+		if ($dimType === null || $scope->isSpecified($node)) {
 			return [];
 		}
 
diff --git a/tests/PHPStan/Levels/data/arrayDimFetches-7.json b/tests/PHPStan/Levels/data/arrayDimFetches-7.json
@@ -28,5 +28,10 @@
         "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,6 +111,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 string does not exist on array<int, string>.',
 				308,
@@ -395,7 +399,21 @@ public function testBug6508(): void
 
 	public function testBug7229(): void
 	{
-		$this->analyse([__DIR__ . '/data/bug-7229.php'], []);
+		$this->checkExplicitMixed = true;
+		$this->analyse([__DIR__ . '/data/bug-7229.php'], [
+			[
+				'Cannot access offset string on mixed.',
+				24,
+			],
+			[
+				'Cannot access offset string on mixed.',
+				29,
+			],
+			[
+				'Cannot access offset string on mixed.',
+				32,
+			],
+		]);
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,7 @@ public function processNode(Node $node, Scope $scope): array`
`56`	`56`
`57`	`57`	`$isOffsetAccessible = $isOffsetAccessibleType->isOffsetAccessible();`
`58`	`58`
`59`		`- if (`
`60`		`- $scope->isInExpressionAssign($node) && $isOffsetAccessible->yes()`
`61`		`- \|\| ($scope->isUndefinedExpressionAllowed($node) \|\| $scope->isSpecified($node)) && !$isOffsetAccessible->no()`
`62`		`- ) {`
	`59`	`+ if (($scope->isInExpressionAssign($node) \|\| $scope->isUndefinedExpressionAllowed($node)) && $isOffsetAccessible->yes()) {`
`63`	`60`	`return [];`
`64`	`61`	`}`
`65`	`62`
`@@ -86,7 +83,7 @@ public function processNode(Node $node, Scope $scope): array`
`86`	`83`	`return [];`
`87`	`84`	`}`
`88`	`85`
`89`		`- if ($dimType === null) {`
	`86`	`+ if ($dimType === null \|\| $scope->isSpecified($node)) {`
`90`	`87`	`return [];`
`91`	`88`	`}`
`92`	`89`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,10 @@`
`28`	`28`	`"message": "Cannot access offset 'foo' on iterable<int\|string, object>.",`
`29`	`29`	`"line": 58,`
`30`	`30`	`"ignorable": true`
	`31`	`+ },`
	`32`	`+ {`
	`33`	`+ "message": "Cannot access offset 'foo' on iterable<int\|string, object>.",`
	`34`	`+ "line": 66,`
	`35`	`+ "ignorable": true`
`31`	`36`	`}`
`32`	`37`	`]`