[5.x] Feature: Allow UnitEnum in authorizeIndividualRecords()

packages/actions/src/Concerns/CanBeAuthorized.php

@@ -9,6 +9,7 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Gate;
 use LogicException;
+use UnitEnum;
 
 trait CanBeAuthorized
 {
@@ -20,16 +21,18 @@ trait CanBeAuthorized
 
     protected bool | Closure $hasAuthorizationNotification = false;
 
-    protected bool | string | Closure | null $authorizeIndividualRecords = null;
+    protected bool | string | UnitEnum | Closure | null $authorizeIndividualRecords = null;
 
     /**
      * @param  Model | class-string | array<mixed> | null  $arguments
      */
     public function authorize(mixed $abilities, Model | string | array | null $arguments = null): static
     {
-        if ($abilities instanceof BackedEnum) {
-            $abilities = $abilities->value;
-        }
+        $abilities = match (true) {
+            $abilities instanceof BackedEnum => $abilities->value,
+            $abilities instanceof UnitEnum => $abilities->name,
+            default => $abilities,
+        };
 
         if (is_string($abilities) || is_array($abilities)) {
             $this->authorization = [
@@ -45,14 +48,16 @@ public function authorize(mixed $abilities, Model | string | array | null $argum
     }
 
     /**
-     * @param  string | BackedEnum | array<string>  $abilities
+     * @param  string | UnitEnum | array<string | UnitEnum>  $abilities
      * @param  Model | array<mixed> | null  $arguments
      */
-    public function authorizeAny(string | BackedEnum | array $abilities, Model | array | null $arguments = null): static
+    public function authorizeAny(string | UnitEnum | array $abilities, Model | array | null $arguments = null): static
     {
-        if ($abilities instanceof BackedEnum) {
-            $abilities = $abilities->value;
-        }
+        $abilities = match (true) {
+            $abilities instanceof BackedEnum => $abilities->value,
+            $abilities instanceof UnitEnum => $abilities->name,
+            default => $abilities,
+        };
 
         $this->authorization = [
             'type' => 'any',
@@ -211,7 +216,7 @@ public function isAuthorizedOrNotHiddenWhenUnauthorized(): bool
         return $this->isAuthorized();
     }
 
-    public function authorizeIndividualRecords(bool | string | Closure | null $callback = true): static
+    public function authorizeIndividualRecords(bool | string | UnitEnum | Closure | null $callback = true): static
     {
         $this->authorizeIndividualRecords = $callback;
 
@@ -220,7 +225,7 @@ public function authorizeIndividualRecords(bool | string | Closure | null $callb
 
     public function getIndividualRecordAuthorizationResponse(Model $record): Response
     {
-        if (is_string($this->authorizeIndividualRecords)) {
+        if (is_string($this->authorizeIndividualRecords) || ($this->authorizeIndividualRecords instanceof UnitEnum)) {
             return Gate::inspect($this->authorizeIndividualRecords, Arr::wrap($record));
         }
 

packages/panels/src/helpers.php

@@ -18,7 +18,7 @@
      *
      * @throws AuthorizationException
      */
-    function authorize(UnitEnum | string $action, Model | string $model, bool $shouldCheckPolicyExistence = true): Response
+    function authorize(string | UnitEnum $action, Model | string $model, bool $shouldCheckPolicyExistence = true): Response
     {
         return get_authorization_response($action, $model, $shouldCheckPolicyExistence)->authorize();
     }
@@ -28,7 +28,7 @@ function authorize(UnitEnum | string $action, Model | string $model, bool $shoul
     /**
      * @param  Model|class-string<Model>  $model
      */
-    function get_authorization_response(UnitEnum | string $action, Model | string $model, bool $shouldCheckPolicyExistence = true): Response
+    function get_authorization_response(string | UnitEnum $action, Model | string $model, bool $shouldCheckPolicyExistence = true): Response
     {
         $user = Filament::auth()->user();
 

tests/src/Forms/Components/CheckboxListTest.php

@@ -10,6 +10,7 @@
 use Filament\Schemas\Concerns\InteractsWithSchemas;
 use Filament\Schemas\Contracts\HasSchemas;
 use Filament\Schemas\Schema;
+use Filament\Tests\Fixtures\Enums\StringBackedEnum;
 use Filament\Tests\Fixtures\Models\Company;
 use Filament\Tests\Fixtures\Models\Team;
 use Filament\Tests\Fixtures\Models\User;
@@ -182,7 +183,7 @@
 
 it('can get `getOptions()` from enum class string', function (): void {
     $checkboxList = CheckboxList::make('options')
-        ->options(\Filament\Tests\Fixtures\Enums\StringBackedEnum::class);
+        ->options(StringBackedEnum::class);
 
     $options = $checkboxList->getOptions();
 

tests/src/Forms/Components/SelectTest.php

@@ -10,6 +10,7 @@
 use Filament\Schemas\Concerns\InteractsWithSchemas;
 use Filament\Schemas\Contracts\HasSchemas;
 use Filament\Schemas\Schema;
+use Filament\Tests\Fixtures\Enums\StringBackedEnum;
 use Filament\Tests\Fixtures\Livewire\Livewire;
 use Filament\Tests\Fixtures\Models\Company;
 use Filament\Tests\Fixtures\Models\Post;
@@ -1402,7 +1403,7 @@ public function render(): View
 
 it('can get `getOptions()` from enum class string', function (): void {
     $select = Select::make('category')
-        ->options(\Filament\Tests\Fixtures\Enums\StringBackedEnum::class);
+        ->options(StringBackedEnum::class);
 
     $options = $select->getOptions();
 

tests/src/Infolists/Components/CodeEntryTest.php

@@ -8,6 +8,7 @@
 use Filament\Schemas\Schema;
 use Filament\Tests\TestCase;
 use Livewire\Component;
+use Phiki\Grammar\Grammar;
 
 use function Filament\Tests\livewire;
 
@@ -61,7 +62,7 @@ public function infolist(Schema $schema): Schema
             ])
             ->components([
                 CodeEntry::make('php_code')
-                    ->grammar(\Phiki\Grammar\Grammar::Php),
+                    ->grammar(Grammar::Php),
             ]);
     }
 

tests/src/Tables/Filters/SelectFilterTest.php

@@ -4,10 +4,12 @@
 
 use Filament\Actions\Concerns\InteractsWithActions;
 use Filament\Actions\Contracts\HasActions;
+use Filament\Forms\Components\Select;
 use Filament\Schemas\Concerns\InteractsWithSchemas;
 use Filament\Schemas\Contracts\HasSchemas;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Filament\Tests\Fixtures\Enums\StringBackedEnum;
 use Filament\Tests\Fixtures\Models\Post;
 use Filament\Tests\Fixtures\Models\User;
 use Filament\Tests\Tables\TestCase;
@@ -254,7 +256,7 @@ public function render(): View
 
 it('can get `getOptions()` from enum class string', function (): void {
     $filter = Tables\Filters\SelectFilter::make('status')
-        ->options(\Filament\Tests\Fixtures\Enums\StringBackedEnum::class);
+        ->options(StringBackedEnum::class);
 
     $options = $filter->getOptions();
 
@@ -400,7 +402,7 @@ public function render(): View
 
     $formField = $filter->getFormField();
 
-    expect($formField)->toBeInstanceOf(\Filament\Forms\Components\Select::class);
+    expect($formField)->toBeInstanceOf(Select::class);
     expect($formField->getName())->toBe('value');
 });
 
@@ -411,7 +413,7 @@ public function render(): View
 
     $formField = $filter->getFormField();
 
-    expect($formField)->toBeInstanceOf(\Filament\Forms\Components\Select::class);
+    expect($formField)->toBeInstanceOf(Select::class);
     expect($formField->getName())->toBe('values');
     expect($formField->isMultiple())->toBeTrue();
 });
@@ -424,7 +426,7 @@ public function render(): View
 
     $formField = $filter->getFormField();
 
-    expect($formField)->toBeInstanceOf(\Filament\Forms\Components\Select::class);
+    expect($formField)->toBeInstanceOf(Select::class);
     expect($formField->isSearchable())->toBeTrue();
     expect($formField->isPreloaded())->toBeTrue();
 });