Improve

Author: VincentLanglet

src/Rules/Classes/EnumSanityRule.php

@@ -6,6 +6,8 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
 use PHPStan\Node\InClassNode;
+use PHPStan\Reflection\InitializerExprContext;
+use PHPStan\Reflection\InitializerExprTypeResolver;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\ShouldNotHappenException;
@@ -34,6 +36,12 @@ final class EnumSanityRule implements Rule
 		'__invoke' => true,
 	];
 
+	public function __construct(
+		private InitializerExprTypeResolver $initializerExprTypeResolver,
+	)
+	{
+	}
+
 	public function getNodeType(): string
 	{
 		return InClassNode::class;
@@ -149,20 +157,14 @@ public function processNode(Node $node, Scope $scope): array
 			$caseName = $stmt->name->name;
 
 			if ($enumNode->scalarType === null && $stmt->expr !== null) {
-				$value = null;
-				if (
-					$stmt->expr instanceof Node\Scalar\Int_
-					|| $stmt->expr instanceof Node\Scalar\String_
-					|| $stmt->expr instanceof Node\Scalar\Float_
-				) {
-					$value = $stmt->expr->value;
-				}
-
 				$errors[] = RuleErrorBuilder::message(sprintf(
-					'Enum %s is not backed, but case %s has value%s.',
+					'Enum %s is not backed, but case %s has value %s.',
 					$classReflection->getDisplayName(),
 					$caseName,
-					$value !== null ? ' ' . $value : '',
+					$this->initializerExprTypeResolver->getType(
+						$stmt->expr,
+						InitializerExprContext::fromScope($scope)
+					)->describe(VerbosityLevel::value()),
 				))
 					->identifier('enum.caseWithValue')
 					->line($stmt->getStartLine())

tests/PHPStan/Rules/Classes/EnumSanityRuleTest.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Classes;
 
+use PHPStan\Reflection\InitializerExprTypeResolver;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use PHPUnit\Framework\Attributes\RequiresPhp;
@@ -14,7 +15,9 @@ class EnumSanityRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new EnumSanityRule();
+		return new EnumSanityRule(
+			self::getContainer()->getByType(InitializerExprTypeResolver::class)
+		);
 	}
 
 	#[RequiresPhp('>= 8.1')]
@@ -158,15 +161,15 @@ public function testBug13768(): void
 				9,
 			],
 			[
-				'Enum Bug13768\Order is not backed, but case D has value 3.',
+				'Enum Bug13768\Order is not backed, but case D has value \'3\'.',
 				10,
 			],
 			[
-				'Enum Bug13768\Order is not backed, but case E has value.',
+				'Enum Bug13768\Order is not backed, but case E has value false.',
 				11,
 			],
 			[
-				'Enum Bug13768\Order is not backed, but case F has value.',
+				'Enum Bug13768\Order is not backed, but case F has value 1.',
 				12,
 			],
 			[