Add enum support (#33)

* feat: add enum support * test: add enum assertions * Update src/HasParameters.php --------- Co-authored-by: Tim MacDonald <[email protected]>
timacdonald · May 15, 2024 · e311f34 · e311f34
1 parent 6ee8d3b
commit e311f34
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 0 deletions.
diff --git a/src/HasParameters.php b/src/HasParameters.php
@@ -4,6 +4,7 @@
 
 namespace TiMacDonald\Middleware;
 
+use BackedEnum;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use ReflectionMethod;
@@ -169,6 +170,10 @@ private static function castToString($value): string
             return '0';
         }
 
+        if ($value instanceof BackedEnum) {
+            return (string) $value->value;
+        }
+
         return (string) $value;
     }
 

diff --git a/tests/HasParametersTest.php b/tests/HasParametersTest.php
@@ -46,18 +46,30 @@ public function testList(): void
         $result = Basic::in(['laravel']);
         $this->assertSame('Tests\\Middleware\\Basic:laravel', $result);
 
+        $result = Basic::in([Framework::Laravel]);
+        $this->assertSame('Tests\\Middleware\\Basic:laravel', $result);
+
         $result = Basic::in(['laravel', 'vue']);
         $this->assertSame('Tests\\Middleware\\Basic:laravel,vue', $result);
 
+        $result = Basic::in([Framework::Laravel, Framework::Vue]);
+        $this->assertSame('Tests\\Middleware\\Basic:laravel,vue', $result);
+
         $result = Basic::in(['laravel', ' ', null, 'tailwind']);
         $this->assertSame('Tests\\Middleware\\Basic:laravel, ,,tailwind', $result);
 
         $result = Basic::in(new Collection(['laravel', 'vue']));
         $this->assertSame('Tests\\Middleware\\Basic:laravel,vue', $result);
 
+        $result = Basic::in(new Collection([Framework::Laravel, Framework::Vue]));
+        $this->assertSame('Tests\\Middleware\\Basic:laravel,vue', $result);
+
         $result = Basic::in([new Collection(['laravel', 'vue'])]);
         $this->assertSame('Tests\\Middleware\\Basic:["laravel","vue"]', $result);
 
+        $result = Basic::in([new Collection([Framework::Laravel, Framework::Vue])]);
+        $this->assertSame('Tests\\Middleware\\Basic:["laravel","vue"]', $result);
+
         $result = Basic::in([true, false]);
         $this->assertSame('Tests\\Middleware\\Basic:1,0', $result);
 
@@ -67,11 +79,17 @@ public function testList(): void
         $result = Variadic::in(['laravel', 'vue']);
         $this->assertSame('Tests\\Middleware\\Variadic:laravel,vue', $result);
 
+        $result = Variadic::in([Framework::Laravel, Framework::Vue]);
+        $this->assertSame('Tests\\Middleware\\Variadic:laravel,vue', $result);
+
         $result = RequiredOptionalVariadic::in(['laravel']);
         $this->assertSame('Tests\\Middleware\\RequiredOptionalVariadic:laravel', $result);
 
         $result = RequiredOptionalVariadic::in(['laravel', 'vue', 'tailwind', 'react']);
         $this->assertSame('Tests\\Middleware\\RequiredOptionalVariadic:laravel,vue,tailwind,react', $result);
+
+        $result = RequiredOptionalVariadic::in([Framework::Laravel, Framework::Vue, Framework::Tailwind, Framework::React]);
+        $this->assertSame('Tests\\Middleware\\RequiredOptionalVariadic:laravel,vue,tailwind,react', $result);
     }
 
     public function testListDoesNotAcceptSubArray(): void
@@ -130,15 +148,24 @@ public function testMap(): void
         $result = Required::with(['required' => 'laravel']);
         $this->assertSame('Tests\\Middleware\\Required:laravel', $result);
 
+        $result = Required::with(['required' => Framework::Laravel]);
+        $this->assertSame('Tests\\Middleware\\Required:laravel', $result);
+
         $result = Required::with(['required' => 1.2]);
         $this->assertSame('Tests\\Middleware\\Required:1.2', $result);
 
         $result = Required::with(new Collection(['required' => 'laravel']));
         $this->assertSame('Tests\\Middleware\\Required:laravel', $result);
 
+        $result = Required::with(new Collection(['required' => Framework::Laravel]));
+        $this->assertSame('Tests\\Middleware\\Required:laravel', $result);
+
         $result = Required::with(['required' => new Collection(['laravel', 'vue'])]);
         $this->assertSame('Tests\\Middleware\\Required:["laravel","vue"]', $result);
 
+        $result = Required::with(['required' => new Collection([Framework::Laravel, Framework::Vue])]);
+        $this->assertSame('Tests\\Middleware\\Required:["laravel","vue"]', $result);
+
         $result = Optional::with([]);
         $this->assertSame('Tests\\Middleware\\Optional:default', $result);
 
@@ -157,12 +184,21 @@ public function testMap(): void
         $result = Optional::with(['optional' => 'laravel']);
         $this->assertSame('Tests\\Middleware\\Optional:laravel', $result);
 
+        $result = Optional::with(['optional' => Framework::Laravel]);
+        $this->assertSame('Tests\\Middleware\\Optional:laravel', $result);
+
         $result = Optional::with(new Collection(['optional' => 'laravel']));
         $this->assertSame('Tests\\Middleware\\Optional:laravel', $result);
 
+        $result = Optional::with(new Collection(['optional' => Framework::Laravel]));
+        $this->assertSame('Tests\\Middleware\\Optional:laravel', $result);
+
         $result = Optional::with(['optional' => new Collection(['laravel', 'vue'])]);
         $this->assertSame('Tests\\Middleware\\Optional:["laravel","vue"]', $result);
 
+        $result = Optional::with(['optional' => new Collection([Framework::Laravel, Framework::Vue])]);
+        $this->assertSame('Tests\\Middleware\\Optional:["laravel","vue"]', $result);
+
         $result = Optional::with(['optional' => true]);
         $this->assertSame('Tests\\Middleware\\Optional:1', $result);
 
@@ -181,18 +217,30 @@ public function testMap(): void
         $result = Variadic::with(['variadic' => 'laravel']);
         $this->assertSame('Tests\\Middleware\\Variadic:laravel', $result);
 
+        $result = Variadic::with(['variadic' => Framework::Laravel]);
+        $this->assertSame('Tests\\Middleware\\Variadic:laravel', $result);
+
         $result = Variadic::with(['variadic' => ['laravel', 'vue']]);
         $this->assertSame('Tests\\Middleware\\Variadic:laravel,vue', $result);
 
+        $result = Variadic::with(['variadic' => [Framework::Laravel, Framework::Vue]]);
+        $this->assertSame('Tests\\Middleware\\Variadic:laravel,vue', $result);
+
         $result = Variadic::with(['variadic' => ['laravel', ' ', null, 'vue']]);
         $this->assertSame('Tests\\Middleware\\Variadic:laravel, ,,vue', $result);
 
         $result = Variadic::with(['variadic' => new Collection(['laravel', 'vue'])]);
         $this->assertSame('Tests\\Middleware\\Variadic:laravel,vue', $result);
 
+        $result = Variadic::with(['variadic' => new Collection([Framework::Laravel, Framework::Vue])]);
+        $this->assertSame('Tests\\Middleware\\Variadic:laravel,vue', $result);
+
         $result = Variadic::with(['variadic' => [new Collection(['laravel', 'vue'])]]);
         $this->assertSame('Tests\\Middleware\\Variadic:["laravel","vue"]', $result);
 
+        $result = Variadic::with(['variadic' => [new Collection([Framework::Laravel, Framework::Vue])]]);
+        $this->assertSame('Tests\\Middleware\\Variadic:["laravel","vue"]', $result);
+
         $result = Variadic::with(['variadic' => true]);
         $this->assertSame('Tests\\Middleware\\Variadic:1', $result);
 
@@ -211,6 +259,9 @@ public function testMap(): void
         $result = RequiredOptionalVariadic::with(['required' => 'laravel']);
         $this->assertSame('Tests\\Middleware\\RequiredOptionalVariadic:laravel,default', $result);
 
+        $result = RequiredOptionalVariadic::with(['required' => Framework::Laravel]);
+        $this->assertSame('Tests\\Middleware\\RequiredOptionalVariadic:laravel,default', $result);
+
         $result = RequiredOptionalVariadic::with(['required' => 'laravel', 'optional' => 'vue']);
         $this->assertSame('Tests\\Middleware\\RequiredOptionalVariadic:laravel,vue', $result);
 
@@ -220,6 +271,9 @@ public function testMap(): void
         $result = RequiredOptionalVariadic::with(['required' => 'laravel', 'optional' => 'vue', 'variadic' => ['tailwind', 'react']]);
         $this->assertSame('Tests\\Middleware\\RequiredOptionalVariadic:laravel,vue,tailwind,react', $result);
 
+        $result = RequiredOptionalVariadic::with(['required' => Framework::Laravel, 'optional' => Framework::Vue, 'variadic' => [Framework::Tailwind, Framework::React]]);
+        $this->assertSame('Tests\\Middleware\\RequiredOptionalVariadic:laravel,vue,tailwind,react', $result);
+
         $result = RequiredOptionalVariadic::with(['required' => 'laravel', 'optional' => 'vue', 'variadic' => []]);
         $this->assertSame('Tests\\Middleware\\RequiredOptionalVariadic:laravel,vue', $result);
     }
@@ -363,3 +417,11 @@ public function testPassingOriginalAndAliasThrows(): void
         ]);
     }
 }
+
+enum Framework: string
+{
+    case Laravel = 'laravel';
+    case Vue = 'vue';
+    case Tailwind = 'tailwind';
+    case React = 'react';
+}