Update enum labels to please PHPstan

filamentphp · Nov 28, 2023 · 556246f · 556246f
1 parent 5d2deeb
commit 556246f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 33 deletions.
diff --git a/packages/actions/src/Concerns/HasSelect.php b/packages/actions/src/Concerns/HasSelect.php
@@ -47,18 +47,18 @@ public function getOptions(): array
             is_string($enum) &&
             enum_exists($enum)
         ) {
+            if (is_a($enum, LabelInterface::class, allow_string: true)) {
+                return collect($enum::cases())
+                    ->mapWithKeys(fn ($case) => [
+                        ($case?->value ?? $case->name) => $case->getLabel() ?? $case->name,
+                    ])
+                    ->all();
+            }
+
             return collect($enum::cases())
-                ->when(
-                    is_a($enum, LabelInterface::class, allow_string: true),
-                    fn (Collection $options): Collection => $options
-                        ->mapWithKeys(fn ($case) => [
-                            ($case?->value ?? $case->name) => $case->getLabel() ?? $case->name,
-                        ]),
-                    fn (Collection $options): Collection => $options
-                        ->mapWithKeys(fn ($case) => [
-                            ($case?->value ?? $case->name) => $case->name,
-                        ]),
-                )
+                ->mapWithKeys(fn ($case) => [
+                    ($case?->value ?? $case->name) => $case->name,
+                ])
                 ->all();
         }
 

diff --git a/packages/forms/src/Components/Concerns/HasOptions.php b/packages/forms/src/Components/Concerns/HasOptions.php
@@ -36,18 +36,18 @@ public function getOptions(): array
             is_string($enum) &&
             enum_exists($enum)
         ) {
+            if (is_a($enum, LabelInterface::class, allow_string: true)) {
+                return collect($enum::cases())
+                    ->mapWithKeys(fn ($case) => [
+                        ($case?->value ?? $case->name) => $case->getLabel() ?? $case->name,
+                    ])
+                    ->all();
+            }
+
             return collect($enum::cases())
-                ->when(
-                    is_a($enum, LabelInterface::class, allow_string: true),
-                    fn (Collection $options): Collection => $options
-                        ->mapWithKeys(fn ($case) => [
-                            ($case?->value ?? $case->name) => $case->getLabel() ?? $case->name,
-                        ]),
-                    fn (Collection $options): Collection => $options
-                        ->mapWithKeys(fn ($case) => [
-                            ($case?->value ?? $case->name) => $case->name,
-                        ]),
-                )
+                ->mapWithKeys(fn ($case) => [
+                    ($case?->value ?? $case->name) => $case->name,
+                ])
                 ->all();
         }
 

diff --git a/packages/tables/src/Filters/Concerns/HasOptions.php b/packages/tables/src/Filters/Concerns/HasOptions.php
@@ -42,18 +42,18 @@ public function getOptions(): array
             is_string($enum) &&
             enum_exists($enum)
         ) {
+            if (is_a($enum, LabelInterface::class, allow_string: true)) {
+                return collect($enum::cases())
+                    ->mapWithKeys(fn ($case) => [
+                        ($case?->value ?? $case->name) => $case->getLabel() ?? $case->name,
+                    ])
+                    ->all();
+            }
+
             return collect($enum::cases())
-                ->when(
-                    is_a($enum, LabelInterface::class, allow_string: true),
-                    fn (Collection $options): Collection => $options
-                        ->mapWithKeys(fn ($case) => [
-                            ($case?->value ?? $case->name) => $case->getLabel() ?? $case->name,
-                        ]),
-                    fn (Collection $options): Collection => $options
-                        ->mapWithKeys(fn ($case) => [
-                            ($case?->value ?? $case->name) => $case->name,
-                        ]),
-                )
+                ->mapWithKeys(fn ($case) => [
+                    ($case?->value ?? $case->name) => $case->name,
+                ])
                 ->all();
         }