more tests

Author: staabm

src/Rules/Arrays/NonexistentOffsetInArrayDimFetchRule.php

@@ -14,6 +14,7 @@
 use PHPStan\Type\VerbosityLevel;
 use function count;
 use function in_array;
+use function is_string;
 use function sprintf;
 
 /**
@@ -106,7 +107,11 @@ public function processNode(Node $node, Scope $scope): array
 			$arrayArg = $node->dim->getArgs()[0]->value;
 			$arrayType = $scope->getType($arrayArg);
 			if (
-				$arrayType->isArray()->yes()
+				$arrayArg instanceof Node\Expr\Variable
+				&& $node->var instanceof Node\Expr\Variable
+				&& is_string($arrayArg->name)
+				&& $arrayArg->name === $node->var->name
+				&& $arrayType->isArray()->yes()
 				&& $arrayType->isIterableAtLeastOnce()->yes()
 			) {
 				return [];
@@ -125,7 +130,11 @@ public function processNode(Node $node, Scope $scope): array
 			$arrayArg = $node->dim->left->getArgs()[0]->value;
 			$arrayType = $scope->getType($arrayArg);
 			if (
-				$arrayType->isList()->yes()
+				$arrayArg instanceof Node\Expr\Variable
+				&& $node->var instanceof Node\Expr\Variable
+				&& is_string($arrayArg->name)
+				&& $arrayArg->name === $node->var->name
+				&& $arrayType->isList()->yes()
 				&& $arrayType->isIterableAtLeastOnce()->yes()
 			) {
 				return [];

tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php

@@ -838,6 +838,14 @@ public function testArrayDimFetchOnArrayKeyFirsOrLastOrCount(): void
 				'Offset 0|null might not exist on list<string>.',
 				12,
 			],
+			[
+				'Offset (int|string) might not exist on non-empty-list<string>.',
+				16,
+			],
+			[
+				'Offset int<-1, max> might not exist on non-empty-list<string>.',
+				45,
+			],
 		]);
 	}
 

tests/PHPStan/Rules/Arrays/data/array-dim-fetch-on-array-key-first-last.php

@@ -6,12 +6,16 @@ class Hello {
 	/**
 	 * @param list<string> $hellos
 	 */
-	public function first(array $hellos): string
+	public function first(array $hellos, array $anotherArray): string
 	{
 		if (rand(0,1)) {
 			return $hellos[array_key_first($hellos)];
 		}
 		if ($hellos !== []) {
+			if ($anotherArray !== []) {
+				return $hellos[array_key_first($anotherArray)];
+			}
+
 			return $hellos[array_key_first($hellos)];
 		}
 		return '';
@@ -31,12 +35,16 @@ public function last(array $hellos): string
 	/**
 	 * @param list<string> $hellos
 	 */
-	public function works(array $hellos): string
+	public function countOnArray(array $hellos, array $anotherArray): string
 	{
 		if ($hellos === []) {
 			return 'nothing';
 		}
 
+		if (rand(0,1)) {
+			return $hellos[count($anotherArray) - 1];
+		}
+
 		return $hellos[count($hellos) - 1];
 	}
 }