From def9e3c722c2513e4747a88705d6acd547405d14 Mon Sep 17 00:00:00 2001 From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com> Date: Thu, 28 Sep 2023 20:50:07 +0200 Subject: [PATCH] Style --- app/Filament/Resources/PackageResource.php | 30 ++++++------- .../PackageResource/Pages/EditPackage.php | 2 +- .../RelationManagers/UsersRelationManager.php | 4 +- app/Http/Controllers/ServerController.php | 16 +++---- app/Http/Middleware/HasAccessToThisGroup.php | 2 +- app/Models/Package.php | 4 +- app/Models/PackageProvider.php | 2 +- ...632_create_package_provider_plan_table.php | 4 +- routes/web.php | 42 +++++++++---------- .../Http/Controllers/ServerControllerTest.php | 22 +++++----- 10 files changed, 64 insertions(+), 64 deletions(-) diff --git a/app/Filament/Resources/PackageResource.php b/app/Filament/Resources/PackageResource.php index a3b6ba0..fbadda2 100644 --- a/app/Filament/Resources/PackageResource.php +++ b/app/Filament/Resources/PackageResource.php @@ -2,18 +2,18 @@ namespace App\Filament\Resources; -use App\Filament\Resources\PackageResource\Pages; -use App\Filament\Resources\PackageResource\RelationManagers; +use Filament\Forms; +use Filament\Tables; use App\Models\Package; use App\Models\Provider; -use App\Models\ProviderPlan; -use Filament\Forms; use Filament\Forms\Form; -use Filament\Notifications\Notification; -use Filament\Resources\Resource; -use Filament\Tables; use Filament\Tables\Table; +use App\Models\ProviderPlan; +use Filament\Resources\Resource; use Illuminate\Support\HtmlString; +use Filament\Notifications\Notification; +use App\Filament\Resources\PackageResource\Pages; +use App\Filament\Resources\PackageResource\RelationManagers; class PackageResource extends Resource { @@ -134,8 +134,8 @@ class PackageResource extends Resource }), Forms\Components\CheckboxList::make("provider_plans") ->label(__('Select plans')) - ->options(fn() => $provider->plans->mapWithKeys(fn(ProviderPlan $providerPlan) => [$providerPlan->id => $providerPlan->label ?? $providerPlan->plan_id])->all()) - ->visible(fn(Forms\Get $get) => $get('select_specific_provider_plans')) + ->options(fn () => $provider->plans->mapWithKeys(fn (ProviderPlan $providerPlan) => [$providerPlan->id => $providerPlan->label ?? $providerPlan->plan_id])->all()) + ->visible(fn (Forms\Get $get) => $get('select_specific_provider_plans')) ->reactive() ->bulkToggleable() ->columns(2) @@ -170,10 +170,10 @@ class PackageResource extends Resource ->color('gray') ->disabled(function (Package $record, Forms\Get $get) { $providers = collect($get('providers')) - ->map(fn(string $id): int => (int)$id) + ->map(fn (string $id): int => (int)$id) ->sort(); - return $record->providers->pluck('id')->map(fn(string $id): int => (int)$id)->sort()->toArray() !== $providers->all(); + return $record->providers->pluck('id')->map(fn (string $id): int => (int)$id)->sort()->toArray() !== $providers->all(); }) ]), Forms\Components\Placeholder::make('save_warning') @@ -183,10 +183,10 @@ class PackageResource extends Resource $package = $livewire->getRecord(); $providers = collect($get('providers')) - ->map(fn(string $id): int => (int)$id) + ->map(fn (string $id): int => (int)$id) ->sort(); - return $package->providers->pluck('id')->map(fn(string $id): int => (int)$id)->sort()->toArray() !== $providers->all(); + return $package->providers->pluck('id')->map(fn (string $id): int => (int)$id)->sort()->toArray() !== $providers->all(); }) ->hiddenLabel(), ]) @@ -217,10 +217,10 @@ class PackageResource extends Resource return "Attached to stripe - {$record->price_monthly} {$record->currency}"; }), Tables\Columns\TextColumn::make('maximum_sites') - ->formatStateUsing(fn(int $state) => $state === 0 ? __('Unlimited') : $state) + ->formatStateUsing(fn (int $state) => $state === 0 ? __('Unlimited') : $state) ->label(__('Maximum sites')), Tables\Columns\TextColumn::make('maximum_servers') - ->formatStateUsing(fn(int $state) => $state === 0 ? __('Unlimited') : $state) + ->formatStateUsing(fn (int $state) => $state === 0 ? __('Unlimited') : $state) ->label(__('Maximum servers')), Tables\Columns\TextColumn::make('users_count') ->counts('users'), diff --git a/app/Filament/Resources/PackageResource/Pages/EditPackage.php b/app/Filament/Resources/PackageResource/Pages/EditPackage.php index 02d35d4..f01c5b0 100644 --- a/app/Filament/Resources/PackageResource/Pages/EditPackage.php +++ b/app/Filament/Resources/PackageResource/Pages/EditPackage.php @@ -2,9 +2,9 @@ namespace App\Filament\Resources\PackageResource\Pages; -use App\Filament\Resources\PackageResource; use Filament\Actions; use Filament\Resources\Pages\EditRecord; +use App\Filament\Resources\PackageResource; class EditPackage extends EditRecord { diff --git a/app/Filament/Resources/PackageResource/RelationManagers/UsersRelationManager.php b/app/Filament/Resources/PackageResource/RelationManagers/UsersRelationManager.php index 7600475..7ef7b8e 100644 --- a/app/Filament/Resources/PackageResource/RelationManagers/UsersRelationManager.php +++ b/app/Filament/Resources/PackageResource/RelationManagers/UsersRelationManager.php @@ -28,10 +28,10 @@ class UsersRelationManager extends RelationManager ...$table->getHeaderActions(), Action::make('add_user') ->label(__('Add user')) - ->form(fn(self $livewire) => [ + ->form(fn (self $livewire) => [ Select::make('user_id') ->label('User') - ->options(User::orderBy('name')->get()->mapWithKeys(fn(User $user) => [$user->id => $user->name])) + ->options(User::orderBy('name')->get()->mapWithKeys(fn (User $user) => [$user->id => $user->name])) ->preload() ->searchable() ->required(), diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php index 082c041..b6a3537 100644 --- a/app/Http/Controllers/ServerController.php +++ b/app/Http/Controllers/ServerController.php @@ -2,17 +2,17 @@ namespace App\Http\Controllers; -use App\Actions\Server\CreateServerAction; -use App\DataTransferObjects\ServerData; -use App\Http\Requests\ServerUpdateRequest; -use App\Http\Resources\ServerResource; -use App\Jobs\Servers\DeleteServer; -use App\Models\ProviderPlan; use App\Models\Server; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Http\RedirectResponse; +use App\Models\ProviderPlan; use Illuminate\Http\Request; +use App\Jobs\Servers\DeleteServer; use Illuminate\Support\Facades\Auth; +use Illuminate\Http\RedirectResponse; +use App\Http\Resources\ServerResource; +use App\DataTransferObjects\ServerData; +use Illuminate\Database\Eloquent\Builder; +use App\Actions\Server\CreateServerAction; +use App\Http\Requests\ServerUpdateRequest; class ServerController extends Controller { diff --git a/app/Http/Middleware/HasAccessToThisGroup.php b/app/Http/Middleware/HasAccessToThisGroup.php index 8b4d06f..d39a4a5 100644 --- a/app/Http/Middleware/HasAccessToThisGroup.php +++ b/app/Http/Middleware/HasAccessToThisGroup.php @@ -3,8 +3,8 @@ namespace App\Http\Middleware; use Closure; -use Illuminate\Http\Request; use Illuminate\Support\Arr; +use Illuminate\Http\Request; class HasAccessToThisGroup { diff --git a/app/Models/Package.php b/app/Models/Package.php index 1a159f6..70d1b75 100644 --- a/app/Models/Package.php +++ b/app/Models/Package.php @@ -3,10 +3,10 @@ namespace App\Models; use App\Casts\PermissionCast; -use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; -use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; +use Illuminate\Database\Eloquent\Factories\HasFactory; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; class Package extends Model { diff --git a/app/Models/PackageProvider.php b/app/Models/PackageProvider.php index e077bf9..fa2a020 100644 --- a/app/Models/PackageProvider.php +++ b/app/Models/PackageProvider.php @@ -2,8 +2,8 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\Pivot; +use Illuminate\Database\Eloquent\Relations\BelongsTo; class PackageProvider extends Pivot { diff --git a/database/migrations/2023_09_28_115632_create_package_provider_plan_table.php b/database/migrations/2023_09_28_115632_create_package_provider_plan_table.php index c422155..368db16 100644 --- a/database/migrations/2023_09_28_115632_create_package_provider_plan_table.php +++ b/database/migrations/2023_09_28_115632_create_package_provider_plan_table.php @@ -1,8 +1,8 @@ withPackage(fn(PackageFactory $factory) => $factory->has(Provider::factory()->withRegion()->withPlan()))->create() + $user = User::factory()->withPackage(fn (PackageFactory $factory) => $factory->has(Provider::factory()->withRegion()->withPlan()))->create() ); $provider = Provider::sole(); @@ -74,13 +74,13 @@ it('can create a new server', function () { 'database_type' => 'postgresql', ]); - Mail::assertQueued(AdminServerCreatedEmail::class, fn(AdminServerCreatedEmail $mail) => $mail->to[0]['address'] === $adminUsers[0]->email); - Mail::assertQueued(AdminServerCreatedEmail::class, fn(AdminServerCreatedEmail $mail) => $mail->to[0]['address'] === $adminUsers[1]->email); + Mail::assertQueued(AdminServerCreatedEmail::class, fn (AdminServerCreatedEmail $mail) => $mail->to[0]['address'] === $adminUsers[0]->email); + Mail::assertQueued(AdminServerCreatedEmail::class, fn (AdminServerCreatedEmail $mail) => $mail->to[0]['address'] === $adminUsers[1]->email); }); it('cannot create a server without permissions', function () { actingAs( - $user = User::factory()->withPackage(fn(PackageFactory $factory) => $factory->serverPermissions(['create' => false,])->has(Provider::factory()->withRegion()->withPlan()))->create() + $user = User::factory()->withPackage(fn (PackageFactory $factory) => $factory->serverPermissions(['create' => false,])->has(Provider::factory()->withRegion()->withPlan()))->create() ); expect($user->can('create', Server::class))->toBeFalse();