Rework

Author: VincentLanglet

src/Rules/Classes/EnumSanityRule.php

@@ -149,10 +149,20 @@ 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.',
+					'Enum %s is not backed, but case %s has value%s.',
 					$classReflection->getDisplayName(),
 					$caseName,
+					$value !== null ? ' '.$value : '',
 				))
 					->identifier('enum.caseWithValue')
 					->line($stmt->getStartLine())

tests/PHPStan/Rules/Classes/EnumSanityRuleTest.php

@@ -95,7 +95,7 @@ public function testRule(): void
 				110,
 			],
 			[
-				'Enum EnumSanity\EnumWithValueButNotBacked is not backed, but case FOO has value.',
+				'Enum EnumSanity\EnumWithValueButNotBacked is not backed, but case FOO has value 1.',
 				114,
 			],
 			[
@@ -146,24 +146,32 @@ public function testBug13768(): void
 	{
 		$this->analyse([__DIR__ . '/data/bug-13768.php'], [
 			[
-				'Enum Bug13768\Order is not backed, but case A has value.',
+				'Enum Bug13768\Order is not backed, but case A has value 1.5.',
 				7,
 			],
 			[
-				'Enum Bug13768\Order is not backed, but case B has value.',
+				'Enum Bug13768\Order is not backed, but case B has value 2.5.',
 				8,
 			],
 			[
-				'Enum Bug13768\Order is not backed, but case C has value.',
+				'Enum Bug13768\Order is not backed, but case C has value 3.',
 				9,
 			],
 			[
-				'Enum Bug13768\Order is not backed, but case D has value.',
+				'Enum Bug13768\Order is not backed, but case D has value 3.',
 				10,
 			],
+			[
+				'Enum Bug13768\Order is not backed, but case E has value.',
+				11,
+			],
+			[
+				'Enum Bug13768\Order is not backed, but case F has value.',
+				12,
+			],
 			[
 				'Enum Bug13768\Backed has duplicate value 1 for cases One, Two.',
-				18,
+				20,
 			],
 		]);
 	}

tests/PHPStan/Rules/Classes/data/bug-13768.php

@@ -8,6 +8,8 @@ enum Order {
 	case B = 2.5;
 	case C = 3;
 	case D = '3';
+	case E = false;
+	case F = Foo::A;
 }
 
 class Foo