Report precise offsets in errors

Fixes phpstan/phpstan#11760
phpstan · Oct 4, 2024 · ce3c893 · ce3c893
1 parent bf19914
commit ce3c893
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/Rules/Arrays/NonexistentOffsetInArrayDimFetchCheck.php b/src/Rules/Arrays/NonexistentOffsetInArrayDimFetchCheck.php
@@ -14,6 +14,7 @@
 use PHPStan\Type\TypeUtils;
 use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
+use function count;
 use function sprintf;
 
 final class NonexistentOffsetInArrayDimFetchCheck
@@ -55,7 +56,7 @@ public function check(
 
 		if ($type->hasOffsetValueType($dimType)->no()) {
 			return [
-				RuleErrorBuilder::message(sprintf('Offset %s does not exist on %s.', $dimType->describe(VerbosityLevel::value()), $type->describe(VerbosityLevel::value())))
+				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')
 					->build(),
 			];
@@ -104,7 +105,7 @@ public function check(
 
 			if ($report) {
 				return [
-					RuleErrorBuilder::message(sprintf('Offset %s might not exist on %s.', $dimType->describe(VerbosityLevel::value()), $type->describe(VerbosityLevel::value())))
+					RuleErrorBuilder::message(sprintf('Offset %s might not exist on %s.', $dimType->describe(count($dimType->getConstantStrings()) > 0 ? VerbosityLevel::precise() : VerbosityLevel::value()), $type->describe(VerbosityLevel::value())))
 						->identifier('offsetAccess.notFound')
 						->build(),
 				];

diff --git a/src/Rules/Arrays/NonexistentOffsetInArrayDimFetchRule.php b/src/Rules/Arrays/NonexistentOffsetInArrayDimFetchRule.php
@@ -12,6 +12,7 @@
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\Type;
 use PHPStan\Type\VerbosityLevel;
+use function count;
 use function sprintf;
 
 /**
@@ -74,7 +75,7 @@ public function processNode(Node $node, Scope $scope): array
 					return [
 						RuleErrorBuilder::message(sprintf(
 							'Cannot access offset %s on %s.',
-							$dimType->describe(VerbosityLevel::value()),
+							$dimType->describe(count($dimType->getConstantStrings()) > 0 ? VerbosityLevel::precise() : VerbosityLevel::value()),
 							$isOffsetAccessibleType->describe(VerbosityLevel::value()),
 						))->identifier('offsetAccess.nonOffsetAccessible')->build(),
 					];

diff --git a/tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php b/tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php
@@ -162,7 +162,7 @@ public function testRule(): void
 				443,
 			],
 			[
-				'Offset \'feature_pretty…\' might not exist on array{version: non-falsy-string, commit: string|null, pretty_version: string|null, feature_version: non-falsy-string, feature_pretty_version?: string|null}.',
+				'Offset \'feature_pretty_version\' might not exist on array{version: non-falsy-string, commit: string|null, pretty_version: string|null, feature_version: non-falsy-string, feature_pretty_version?: string|null}.',
 				504,
 			],
 			[
-Original file line number
+Diff line change
@@ Expand Up / @@ -162,7 +162,7 @@ public function testRule(): void @@
 ,
     			],
     			[
-    				'Offset \'feature_pretty…\' might not exist on array{version: non-falsy-string, commit: string|null, pretty_version: string|null, feature_version: non-falsy-string, feature_pretty_version?: string|null}.',
+    				'Offset \'feature_pretty_version\' might not exist on array{version: non-falsy-string, commit: string|null, pretty_version: string|null, feature_version: non-falsy-string, feature_pretty_version?: string|null}.',
 ,
     			],
     			[
@@ Expand Down @@