Merge pull request #23 from Althinect/dev

Laravel 10 Support
Althinect · Feb 19, 2023 · d9736ed · d9736ed
2 parents aade334 + f0afecc
commit d9736ed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -16,9 +16,9 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0|^8.1",
+        "php": "^7.4|^8.0|^8.1|^8.2",
         "filament/filament": "^2.0|^2.1",
-        "illuminate/support": "^8|^9",
+        "illuminate/support": "^8|^9|^10",
         "spatie/laravel-permission": "^5.4"
     },
     "require-dev": {

diff --git a/src/Resources/PermissionResource.php b/src/Resources/PermissionResource.php
@@ -7,7 +7,6 @@
 use Althinect\FilamentSpatieRolesPermissions\Resources\PermissionResource\Pages\ListPermissions;
 use Althinect\FilamentSpatieRolesPermissions\Resources\PermissionResource\Pages\ViewPermission;
 use Althinect\FilamentSpatieRolesPermissions\Resources\PermissionResource\RelationManager\RoleRelationManager;
-use Filament\Forms\Components\BelongsToManyMultiSelect;
 use Filament\Forms\Components\Card;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\Select;
@@ -56,7 +55,8 @@ public static function form(Form $form): Form
                                 ->label(__('filament-spatie-roles-permissions::filament-spatie.field.name')),
                             TextInput::make('guard_name')
                                 ->label(__('filament-spatie-roles-permissions::filament-spatie.field.guard_name')),
-                            BelongsToManyMultiSelect::make('roles')
+                            Select::make('roles')
+                                ->multiple()
                                 ->label(__('filament-spatie-roles-permissions::filament-spatie.field.roles'))
                                 ->relationship('roles', 'name')
                                 ->preload(config('filament-spatie-roles-permissions.preload_roles'))

diff --git a/src/Resources/RoleResource.php b/src/Resources/RoleResource.php
@@ -7,9 +7,10 @@
 use Althinect\FilamentSpatieRolesPermissions\Resources\RoleResource\Pages\ListRoles;
 use Althinect\FilamentSpatieRolesPermissions\Resources\RoleResource\Pages\ViewRole;
 use Althinect\FilamentSpatieRolesPermissions\Resources\RoleResource\RelationManager\PermissionRelationManager;
-use Filament\Forms\Components\BelongsToManyMultiSelect;
 use Filament\Forms\Components\Card;
 use Filament\Forms\Components\Grid;
+use Filament\Forms\Components\MultiSelect;
+use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Resources\Form;
 use Filament\Resources\Resource;
@@ -53,7 +54,8 @@ public static function form(Form $form): Form
                                     ->label(__('filament-spatie-roles-permissions::filament-spatie.field.name')),
                                 TextInput::make('guard_name')
                                     ->label(__('filament-spatie-roles-permissions::filament-spatie.field.guard_name')),
-                                BelongsToManyMultiSelect::make('permissions')
+                                Select::make('permissions')
+                                    ->multiple()
                                     ->label(__('filament-spatie-roles-permissions::filament-spatie.field.permissions'))
                                     ->relationship('permissions', 'name')
                                     ->preload(config('filament-spatie-roles-permissions.preload_permissions'))