Avoid duplicates

Author: VincentLanglet

src/Rules/Arrays/NonexistentOffsetInArrayDimFetchCheck.php

@@ -12,7 +12,10 @@
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Type\BenevolentUnionType;
 use PHPStan\Type\ErrorType;
+use PHPStan\Type\MixedType;
+use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
+use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypeUtils;
 use PHPStan\Type\VerbosityLevel;
 use function count;
@@ -44,11 +47,21 @@ public function check(
 		Type $dimType,
 	): array
 	{
+		if ($dimType instanceof MixedType) {
+			$dimToCheck = $dimType;
+		} else {
+			// Non allowed array keys are already reported by InvalidKeyInArrayItemRule
+			$dimToCheck = TypeCombinator::intersect($dimType, AllowedArrayKeysTypes::getType());
+			if ($dimToCheck instanceof NeverType) {
+				return [];
+			}
+		}
+
 		$typeResult = $this->ruleLevelHelper->findTypeToCheck(
 			$scope,
 			NullsafeOperatorHelper::getNullsafeShortcircuitedExprRespectingScope($scope, $var),
 			$unknownClassPattern,
-			static fn (Type $type): bool => $type->hasOffsetValueType($dimType)->yes(),
+			static fn (Type $type): bool => $type->hasOffsetValueType($dimToCheck)->yes(),
 		);
 		$type = $typeResult->getType();
 		if ($type instanceof ErrorType) {
@@ -59,7 +72,7 @@ public function check(
 			return [];
 		}
 
-		if ($type->hasOffsetValueType($dimType)->no()) {
+		if ($type->hasOffsetValueType($dimToCheck)->no()) {
 			return [
 				RuleErrorBuilder::message(sprintf('Offset %s does not exist on %s.', $dimType->describe(count($dimType->getConstantStrings()) > 0 ? VerbosityLevel::precise() : VerbosityLevel::value()), $type->describe(VerbosityLevel::value())))
 					->identifier('offsetAccess.notFound')
@@ -81,23 +94,23 @@ public function check(
 					$this->reportPossiblyNonexistentGeneralArrayOffset
 					&& $innerType->isArray()->yes()
 					&& !$innerType->isConstantArray()->yes()
-					&& !$innerType->hasOffsetValueType($dimType)->yes()
+					&& !$innerType->hasOffsetValueType($dimToCheck)->yes()
 				) {
 					$report = true;
 					break;
 				}
 				if (
 					$this->reportPossiblyNonexistentConstantArrayOffset
 					&& $innerType->isConstantArray()->yes()
-					&& !$innerType->hasOffsetValueType($dimType)->yes()
+					&& !$innerType->hasOffsetValueType($dimToCheck)->yes()
 				) {
 					$report = true;
 					break;
 				}
-				if ($dimType instanceof BenevolentUnionType) {
-					$flattenedInnerTypes = [$dimType];
+				if ($dimToCheck instanceof BenevolentUnionType) {
+					$flattenedInnerTypes = [$dimToCheck];
 				} else {
-					$flattenedInnerTypes = TypeUtils::flattenTypes($dimType);
+					$flattenedInnerTypes = TypeUtils::flattenTypes($dimToCheck);
 				}
 				foreach ($flattenedInnerTypes as $innerDimType) {
 					if (

tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php

@@ -193,10 +193,6 @@ 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,
@@ -205,10 +201,6 @@ public function testStrings(): void
 				'Offset 12.34 might not exist on array|string.',
 				28,
 			],
-			[
-				'Offset int|object might not exist on array|string.',
-				32,
-			],
 		]);
 	}