Add class name to message

Author: zonuexe

src/Rules/Classes/ClassConstantRule.php

@@ -26,6 +26,7 @@
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\VerbosityLevel;
 use function array_merge;
+use function assert;
 use function in_array;
 use function sprintf;
 use function strtolower;
@@ -76,7 +77,9 @@ public function processNode(Node $node, Scope $scope): array
 				$type = $typeResult->getType();
 
 				if (!$type->isString()->yes()) {
-					$errors[] = RuleErrorBuilder::message(sprintf('Cannot fetch class constant with a non-stringable type %s.', $nameType->describe(VerbosityLevel::precise())))
+					$className = $scope->getClassReflection()?->getDisplayName();
+					assert($className !== null);
+					$errors[] = RuleErrorBuilder::message(sprintf('Cannot fetch constant from class %s with a non-stringable type %s.', $className, $nameType->describe(VerbosityLevel::precise())))
 						->identifier('classConstant.fetchInvalidExpression')
 						->build();
 				}

tests/PHPStan/Rules/Classes/ClassConstantRuleTest.php

@@ -449,7 +449,7 @@ public function testDynamicAccess(): void
 				17,
 			],
 			[
-				'Cannot fetch class constant with a non-stringable type object.',
+				'Cannot fetch constant from class ClassConstantDynamicAccess\Foo with a non-stringable type object.',
 				19,
 			],
 			[
@@ -494,31 +494,31 @@ public function testStringableDynamicAccess(): void
 
 		$this->analyse([__DIR__ . '/data/dynamic-constant-stringable-access.php'], [
 			[
-				'Cannot fetch class constant with a non-stringable type mixed.',
+				'Cannot fetch constant from class ClassConstantDynamicStringableAccess\Foo with a non-stringable type mixed.',
 				13,
 			],
 			[
-				'Cannot fetch class constant with a non-stringable type string|null.',
+				'Cannot fetch constant from class ClassConstantDynamicStringableAccess\Foo with a non-stringable type string|null.',
 				14,
 			],
 			[
-				'Cannot fetch class constant with a non-stringable type Stringable|null.',
+				'Cannot fetch constant from class ClassConstantDynamicStringableAccess\Foo with a non-stringable type Stringable|null.',
 				15,
 			],
 			[
-				'Cannot fetch class constant with a non-stringable type int.',
+				'Cannot fetch constant from class ClassConstantDynamicStringableAccess\Foo with a non-stringable type int.',
 				16,
 			],
 			[
-				'Cannot fetch class constant with a non-stringable type int|null.',
+				'Cannot fetch constant from class ClassConstantDynamicStringableAccess\Foo with a non-stringable type int|null.',
 				17,
 			],
 			[
-				'Cannot fetch class constant with a non-stringable type DateTime|string.',
+				'Cannot fetch constant from class ClassConstantDynamicStringableAccess\Foo with a non-stringable type DateTime|string.',
 				18,
 			],
 			[
-				'Cannot fetch class constant with a non-stringable type 1111.',
+				'Cannot fetch constant from class ClassConstantDynamicStringableAccess\Foo with a non-stringable type 1111.',
 				19,
 			],
 		]);