Simplified case detection

Author: marc-mabe

composer.json

@@ -22,8 +22,8 @@
     },
     "require-dev": {
         "phpstan/phpstan": "^1.3.0",
-        "phpunit/phpunit": "^7.5.20 | ^8.5.8 | ^9.3.8",
-        "vimeo/psalm": "^4.16.1"
+        "phpunit/phpunit": "^7.5.20 | ^8.5.22 | ^9.5.11",
+        "vimeo/psalm": "^4.17.0"
     },
     "autoload": {
         "psr-4": {

src/Mabe/Enum/Cl/EmulatedBackedEnumTrait.php

@@ -205,39 +205,34 @@ private static function init(string $enumClass): void
                 "Enum class \"{$enumClass}\" needs to be final"
             );
 
-            // Case constants must be private
             $caseConstants = [];
-            if (\PHP_VERSION_ID >= 80000) {
-                /** @phpstan-ignore-next-line */
-                $caseConstants = $reflection->getConstants(ReflectionClassConstant::IS_PRIVATE);
-            } else {
-                foreach ($reflection->getReflectionConstants() as $reflConstant) {
-                    if ($reflConstant->isPrivate()) {
-                        $caseConstants[$reflConstant->getName()] = $reflConstant->getValue();
-                    }
+            $cases         = [];
+            foreach ($reflection->getReflectionConstants() as $reflConstant) {
+                // Case constants must be private
+                if ($reflConstant->isPrivate()) {
+                    $name  = $reflConstant->getName();
+                    $value = $reflConstant->getValue();
+
+                    assert(
+                        /** @phpstan-ignore-next-line */
+                        (\is_subclass_of($enumClass, EmulatedIntEnum::class) && \is_int($value))
+                        || (\is_subclass_of($enumClass, EmulatedStringEnum::class) && \is_string($value)), /** @phpstan-ignore-line */
+                        "Enum case constant \"{$enumClass}::{$name}\" does not match enum backing type"
+                    );
+
+                    assert(
+                        \count(\array_keys($caseConstants, $value, true)) === 0,
+                        "Enum case value for {$enumClass}::{$name} is ambiguous"
+                    );
+
+                    /** @var static $case */
+                    $case = new $enumClass($name, $value);
+
+                    $cases[$name]         = $case;
+                    $caseConstants[$name] = $value;
                 }
             }
 
-            $cases = [];
-            foreach ($caseConstants as $name => $value) {
-                assert(
-                    /** @phpstan-ignore-next-line */
-                    (\is_subclass_of($enumClass, EmulatedIntEnum::class) && \is_int($value))
-                    || (\is_subclass_of($enumClass, EmulatedStringEnum::class) && \is_string($value)), /** @phpstan-ignore-line */
-                    "Enum case constant \"{$enumClass}::{$name}\" does not match enum backing type"
-                );
-
-                assert(
-                    \count(\array_keys($caseConstants, $value, true)) === 1,
-                    "Enum case value for {$enumClass}::{$name} is ambiguous"
-                );
-
-                /** @var static $case */
-                $case         = new $enumClass($name, $value);
-                $cases[$name] = $case;
-            }
-
-            /** @var array<string, string|int> $caseConstants */
             self::$cases[$enumClass]         = $cases;
             self::$caseConstants[$enumClass] = $caseConstants;
         }

src/Mabe/Enum/Cl/EmulatedUnitEnum.php

@@ -130,20 +130,13 @@ private static function init(string $enumClass): void
                 "Enum class \"{$enumClass}\" needs to be final"
             );
 
-            // Case constants must be private
             $cases = [];
-            if (\PHP_VERSION_ID >= 80000) {
-                /** @phpstan-ignore-next-line */
-                foreach ($reflection->getConstants(ReflectionClassConstant::IS_PRIVATE) as $name => $_) {
+            foreach ($reflection->getReflectionConstants() as $reflConstant) {
+                // Case constants must be private
+                if ($reflConstant->isPrivate()) {
+                    $name         = $reflConstant->getName();
                     $cases[$name] = new $enumClass($name);
                 }
-            } else {
-                foreach ($reflection->getReflectionConstants() as $reflConstant) {
-                    if ($reflConstant->isPrivate()) {
-                        $name         = $reflConstant->getName();
-                        $cases[$name] = new $enumClass($name);
-                    }
-                }
             }
 
             self::$cases[$enumClass] = $cases;

tests/AmbiguousBackingValuesEnumEmulatedTest.php

@@ -18,14 +18,14 @@ public function setUp(): void
     public function testAmbiguousBackingValuesForIntBackedEnum(): void
     {
         $this->expectException('AssertionError');
-        $this->expectExceptionMessage('Enum case value for AmbiguousIntValuesEnumEmulated::TEST1 is ambiguous');
+        $this->expectExceptionMessage('Enum case value for AmbiguousIntValuesEnumEmulated::TEST2 is ambiguous');
         $cases = AmbiguousIntValuesEnumEmulated::cases();
     }
 
     public function testAmbiguousBackingValuesEnumEmulatedForStringBackedEnum(): void
     {
         $this->expectException('AssertionError');
-        $this->expectExceptionMessage('Enum case value for AmbiguousStringValuesEnumEmulated::TEST1 is ambiguous');
+        $this->expectExceptionMessage('Enum case value for AmbiguousStringValuesEnumEmulated::TEST2 is ambiguous');
         $cases = AmbiguousStringValuesEnumEmulated::cases();
     }
 }