DuplicateDeclarationRule - it's not possible to declare enum case when constant with same name already exists - and vice versa

Author: kukulich

src/Rules/Classes/DuplicateDeclarationRule.php

@@ -3,6 +3,7 @@
 namespace PHPStan\Rules\Classes;
 
 use PhpParser\Node;
+use PhpParser\Node\Stmt\ClassConst;
 use PhpParser\Node\Stmt\EnumCase;
 use PHPStan\Analyser\Scope;
 use PHPStan\Node\InClassNode;
@@ -31,35 +32,30 @@ public function processNode(Node $node, Scope $scope): array
 
 		$errors = [];
 
-		$declaredClassConstants = [];
-		foreach ($node->getOriginalNode()->getConstants() as $constDecl) {
-			foreach ($constDecl->consts as $const) {
-				if (array_key_exists($const->name->name, $declaredClassConstants)) {
+		$declaredClassConstantsOrEnumCases = [];
+		foreach ($node->getOriginalNode()->stmts as $stmtNode) {
+			if ($stmtNode instanceof EnumCase) {
+				if (array_key_exists($stmtNode->name->name, $declaredClassConstantsOrEnumCases)) {
 					$errors[] = RuleErrorBuilder::message(sprintf(
-						'Cannot redeclare constant %s::%s.',
+						'Cannot redeclare enum case %s::%s.',
 						$classReflection->getDisplayName(),
-						$const->name->name
-					))->line($const->getLine())->nonIgnorable()->build();
+						$stmtNode->name->name
+					))->line($stmtNode->getLine())->nonIgnorable()->build();
 				} else {
-					$declaredClassConstants[$const->name->name] = true;
+					$declaredClassConstantsOrEnumCases[$stmtNode->name->name] = true;
+				}
+			} elseif ($stmtNode instanceof ClassConst) {
+				foreach ($stmtNode->consts as $classConstNode) {
+					if (array_key_exists($classConstNode->name->name, $declaredClassConstantsOrEnumCases)) {
+						$errors[] = RuleErrorBuilder::message(sprintf(
+							'Cannot redeclare constant %s::%s.',
+							$classReflection->getDisplayName(),
+							$classConstNode->name->name
+						))->line($classConstNode->getLine())->nonIgnorable()->build();
+					} else {
+						$declaredClassConstantsOrEnumCases[$classConstNode->name->name] = true;
+					}
 				}
-			}
-		}
-
-		$declaredEnumCases = [];
-		foreach ($node->getOriginalNode()->stmts as $stmtNode) {
-			if (!$stmtNode instanceof EnumCase) {
-				continue;
-			}
-
-			if (array_key_exists($stmtNode->name->name, $declaredEnumCases)) {
-				$errors[] = RuleErrorBuilder::message(sprintf(
-					'Cannot redeclare enum case %s::%s.',
-					$classReflection->getDisplayName(),
-					$stmtNode->name->name
-				))->line($stmtNode->getLine())->nonIgnorable()->build();
-			} else {
-				$declaredEnumCases[$stmtNode->name->name] = true;
 			}
 		}
 

tests/PHPStan/Rules/Classes/DuplicateDeclarationRuleTest.php

@@ -82,7 +82,15 @@ public function testDuplicateEnumCase(): void
 		$this->analyse([__DIR__ . '/data/duplicate-enum-cases.php'], [
 			[
 				'Cannot redeclare enum case DuplicatedEnumCase\Foo::BAR.',
-				9,
+				10,
+			],
+			[
+				'Cannot redeclare enum case DuplicatedEnumCase\Boo::BAR.',
+				17,
+			],
+			[
+				'Cannot redeclare constant DuplicatedEnumCase\Hoo::BAR.',
+				23,
 			],
 		]);
 	}

tests/PHPStan/Rules/Classes/data/duplicate-enum-cases.php

@@ -6,5 +6,19 @@ enum Foo
 {
 	case BAR;
 	case FOO;
+	case bar;
 	case BAR;
 }
+
+enum Boo
+{
+	const BAR = 0;
+	const bar = 0;
+	case BAR;
+}
+
+enum Hoo
+{
+	case BAR;
+	const BAR = 0;
+}