Fixed ReflectionEnum::getCase()/hasCase() adapters compatibility with…

… native reflection
Roave · Oct 14, 2022 · 66c2712 · 66c2712
1 parent fdbc0d8
commit 66c2712
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/src/Reflection/Adapter/ReflectionEnum.php b/src/Reflection/Adapter/ReflectionEnum.php
@@ -23,7 +23,6 @@
 use function array_combine;
 use function array_map;
 use function array_values;
-use function assert;
 use function constant;
 use function sprintf;
 use function strtolower;
@@ -499,16 +498,16 @@ public function isEnum(): bool
 
     public function hasCase(string $name): bool
     {
-        assert($name !== '');
+        if ($name === '') {
+            return false;
+        }
 
         return $this->betterReflectionEnum->hasCase($name);
     }
 
     public function getCase(string $name): ReflectionEnumUnitCase|ReflectionEnumBackedCase
     {
-        assert($name !== '');
-
-        $case = $this->betterReflectionEnum->getCase($name);
+        $case = $name !== '' ? $this->betterReflectionEnum->getCase($name) : null;
 
         if ($case === null) {
             throw new CoreReflectionException(sprintf('Case %s::%s does not exist', $this->betterReflectionEnum->getName(), $name));

diff --git a/test/unit/Reflection/Adapter/ReflectionEnumTest.php b/test/unit/Reflection/Adapter/ReflectionEnumTest.php
@@ -594,6 +594,28 @@ public function testGetAttributesThrowsExceptionForInvalidFlags(): void
         $reflectionEnumAdapter->getAttributes(null, 123);
     }
 
+    public function testHasCaseReturnsFalseWhenCaseNameIsEmpty(): void
+    {
+        $betterReflectionEnum  = $this->createMock(BetterReflectionEnum::class);
+        $reflectionEnumAdapter = new ReflectionEnumAdapter($betterReflectionEnum);
+
+        self::assertFalse($reflectionEnumAdapter->hasCase(''));
+    }
+
+    public function testGetCaseThrowsExceptionWhenCaseNameIsEmpty(): void
+    {
+        $betterReflectionEnum = $this->createMock(BetterReflectionEnum::class);
+        $betterReflectionEnum
+            ->method('getName')
+            ->willReturn('SomeEnum');
+
+        $reflectionEnumAdapter = new ReflectionEnumAdapter($betterReflectionEnum);
+
+        self::expectException(CoreReflectionException::class);
+        self::expectExceptionMessage('Case SomeEnum:: does not exist');
+        $reflectionEnumAdapter->getCase('');
+    }
+
     public function testGetCaseWhenCaseDoesNotExist(): void
     {
         $betterReflectionEnum = $this->createMock(BetterReflectionEnum::class);