Improve EnumSanityRule

Author: VincentLanglet

src/Rules/Classes/EnumSanityRule.php

@@ -145,27 +145,16 @@ public function processNode(Node $node, Scope $scope): array
 			}
 			$caseName = $stmt->name->name;
 
-			if ($stmt->expr instanceof Node\Scalar\Int_ || $stmt->expr instanceof Node\Scalar\String_) {
-				if ($enumNode->scalarType === null) {
-					$errors[] = RuleErrorBuilder::message(sprintf(
-						'Enum %s is not backed, but case %s has value %s.',
-						$classReflection->getDisplayName(),
-						$caseName,
-						$stmt->expr->value,
-					))
-						->identifier('enum.caseWithValue')
-						->line($stmt->getStartLine())
-						->nonIgnorable()
-						->build();
-				} else {
-					$caseValue = $stmt->expr->value;
-
-					if (!isset($enumCases[$caseValue])) {
-						$enumCases[$caseValue] = [];
-					}
-
-					$enumCases[$caseValue][] = $caseName;
-				}
+			if ($enumNode->scalarType === null && $stmt->expr !== null) {
+				$errors[] = RuleErrorBuilder::message(sprintf(
+					'Enum %s is not backed, but case %s has value.',
+					$classReflection->getDisplayName(),
+					$caseName,
+				))
+					->identifier('enum.caseWithValue')
+					->line($stmt->getStartLine())
+					->nonIgnorable()
+					->build();
 			}
 
 			if ($enumNode->scalarType === null) {
@@ -187,6 +176,16 @@ public function processNode(Node $node, Scope $scope): array
 			}
 
 			$exprType = $scope->getType($stmt->expr);
+			$constantValues = $exprType->getConstantScalarValues();
+			if (count($constantValues) === 1) {
+				$caseValue = $constantValues[0];
+				if (!isset($enumCases[$caseValue])) {
+					$enumCases[$caseValue] = [];
+				}
+
+				$enumCases[$caseValue][] = $caseName;
+			}
+
 			$scalarType = $enumNode->scalarType->toLowerString() === 'int' ? new IntegerType() : new StringType();
 			if ($scalarType->isSuperTypeOf($exprType)->yes()) {
 				continue;

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 1.',
+				'Enum EnumSanity\EnumWithValueButNotBacked is not backed, but case FOO has value.',
 				114,
 			],
 			[
@@ -119,24 +119,28 @@ public function testBug9402(): void
 	}
 
 	#[RequiresPhp('>= 8.1')]
-	public function testBug11592(): void
+	public function testBug13768(): void
 	{
-		$this->analyse([__DIR__ . '/data/bug-11592.php'], [
+		$this->analyse([__DIR__ . '/data/bug-13768.php'], [
 			[
-				'Enum Bug11592\Test2 cannot redeclare native method cases().',
-				22,
+				'Enum Bug13768\Order is not backed, but case A has value.',
+				7,
 			],
 			[
-				'Enum Bug11592\BackedTest2 cannot redeclare native method cases().',
-				37,
+				'Enum Bug13768\Order is not backed, but case B has value.',
+				8,
 			],
 			[
-				'Enum Bug11592\BackedTest2 cannot redeclare native method from().',
-				39,
+				'Enum Bug13768\Order is not backed, but case C has value.',
+				9,
+			],
+			[
+				'Enum Bug13768\Order is not backed, but case D has value.',
+				10,
 			],
 			[
-				'Enum Bug11592\BackedTest2 cannot redeclare native method tryFrom().',
-				41,
+				'Enum Bug13768\Backed has duplicate value 1 for cases One, Two.',
+				18,
 			],
 		]);
 	}

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

@@ -0,0 +1,21 @@
+<?php
+
+namespace Bug13768;
+
+enum Order {
+	case U;
+	case A = 1.5;
+	case B = 2.5;
+	case C = 3;
+	case D = '3';
+}
+
+class Foo
+{
+	public const A = 1;
+}
+
+enum Backed: int {
+	case One = Foo::A;
+	case Two = Foo::A;
+}