Merge pull request #1527 from VincentLanglet/useHasValueExpression

Stop returning ReflectionEnumBackedCase without value

Author: Ocramius

src/Reflection/Adapter/ReflectionEnum.php

@@ -583,7 +583,7 @@ public function getCase(string $name): ReflectionEnumUnitCase|ReflectionEnumBack
             throw new CoreReflectionException(sprintf('Case %s::%s does not exist', $this->betterReflectionEnum->getName(), $name));
         }
 
-        if ($this->betterReflectionEnum->isBacked()) {
+        if ($case->hasValueExpression()) {
             return new ReflectionEnumBackedCase($case);
         }
 
@@ -593,9 +593,8 @@ public function getCase(string $name): ReflectionEnumUnitCase|ReflectionEnumBack
     /** @return list<ReflectionEnumUnitCase|ReflectionEnumBackedCase> */
     public function getCases(): array
     {
-        /** @psalm-suppress ImpureFunctionCall */
-        return array_map(function (BetterReflectionEnumCase $case): ReflectionEnumUnitCase|ReflectionEnumBackedCase {
-            if ($this->betterReflectionEnum->isBacked()) {
+        return array_map(static function (BetterReflectionEnumCase $case): ReflectionEnumUnitCase|ReflectionEnumBackedCase {
+            if ($case->hasValueExpression()) {
                 return new ReflectionEnumBackedCase($case);
             }
 

src/Reflection/StringCast/ReflectionEnumCaseStringCast.php

@@ -21,8 +21,8 @@ public static function toString(ReflectionEnumCase $enumCaseReflection, bool $in
     {
         $enumReflection = $enumCaseReflection->getDeclaringEnum();
 
-        $value = $enumReflection->isBacked() ? $enumCaseReflection->getValue() : 'Object';
-        $type  = $enumReflection->isBacked() ? gettype($value) : $enumReflection->getName();
+        $value = $enumCaseReflection->hasValueExpression() ? $enumCaseReflection->getValue() : 'Object';
+        $type  = $enumCaseReflection->hasValueExpression() ? gettype($value) : $enumReflection->getName();
 
         return sprintf(
             "%sConstant [ public %s %s ] { %s }\n",

test/unit/Reflection/Adapter/ReflectionEnumTest.php

@@ -732,11 +732,11 @@ public function testGetCaseForPureEnum(): void
     public function testGetCaseForBackedEnum(): void
     {
         $betterReflectionEnumCase = $this->createMock(BetterReflectionEnumCase::class);
+        $betterReflectionEnumCase
+            ->method('hasValueExpression')
+            ->willReturn(true);
 
         $betterReflectionEnum = $this->createMock(BetterReflectionEnum::class);
-        $betterReflectionEnum
-            ->method('isBacked')
-            ->willReturn(true);
         $betterReflectionEnum
             ->method('getCase')
             ->willReturn($betterReflectionEnumCase);
@@ -749,11 +749,11 @@ public function testGetCaseForBackedEnum(): void
     public function testGetCasesForPureEnum(): void
     {
         $betterReflectionEnumCase = $this->createMock(BetterReflectionEnumCase::class);
+        $betterReflectionEnumCase
+            ->method('hasValueExpression')
+            ->willReturn(false);
 
         $betterReflectionEnum = $this->createMock(BetterReflectionEnum::class);
-        $betterReflectionEnum
-            ->method('isBacked')
-            ->willReturn(false);
         $betterReflectionEnum
             ->method('getCases')
             ->willReturn([$betterReflectionEnumCase]);
@@ -766,11 +766,11 @@ public function testGetCasesForPureEnum(): void
     public function testGetCasesForBackedEnum(): void
     {
         $betterReflectionEnumCase = $this->createMock(BetterReflectionEnumCase::class);
+        $betterReflectionEnumCase
+            ->method('hasValueExpression')
+            ->willReturn(true);
 
         $betterReflectionEnum = $this->createMock(BetterReflectionEnum::class);
-        $betterReflectionEnum
-            ->method('isBacked')
-            ->willReturn(true);
         $betterReflectionEnum
             ->method('getCases')
             ->willReturn([$betterReflectionEnumCase]);