From 48ae561ea452048c95fabb2b5fb735dd3676f79d Mon Sep 17 00:00:00 2001 From: Saeed Vaziry Date: Thu, 13 Mar 2025 20:53:14 +0100 Subject: [PATCH] code-style --- app/Http/Controllers/API/ProjectController.php | 5 +++-- app/Http/Controllers/API/ServerController.php | 3 ++- app/Http/Controllers/API/ServerProviderController.php | 7 ++++--- app/Http/Controllers/API/ServerSSHKeyController.php | 3 ++- .../Controllers/API/StorageProviderController.php | 7 ++++--- app/Web/Pages/Scripts/Index.php | 3 ++- .../Pages/Servers/CronJobs/Widgets/CronJobsList.php | 6 ++++-- app/Web/Pages/Servers/Databases/Backups.php | 3 ++- app/Web/Pages/Servers/Databases/Traits/Navigation.php | 3 ++- .../Servers/Databases/Widgets/BackupFilesList.php | 3 ++- .../Pages/Servers/Databases/Widgets/BackupsList.php | 3 ++- .../Servers/Databases/Widgets/DatabaseUsersList.php | 7 ++++--- .../Pages/Servers/Databases/Widgets/DatabasesList.php | 3 ++- .../Pages/Servers/FileManager/Widgets/FilesList.php | 3 ++- app/Web/Pages/Servers/Firewall/Widgets/RulesList.php | 6 ++++-- app/Web/Pages/Servers/Logs/Traits/Navigation.php | 3 ++- app/Web/Pages/Servers/Logs/Widgets/LogsList.php | 8 +++++--- app/Web/Pages/Servers/Page.php | 3 ++- app/Web/Pages/Servers/SSHKeys/Index.php | 3 ++- app/Web/Pages/Servers/SSHKeys/Widgets/SshKeysList.php | 3 ++- app/Web/Pages/Servers/Settings.php | 6 ++++-- app/Web/Pages/Servers/Sites/Page.php | 3 ++- .../Servers/Sites/Pages/Queues/Widgets/QueuesList.php | 9 +++++---- .../Servers/Sites/Pages/SSL/Widgets/SslsList.php | 3 ++- app/Web/Pages/Servers/Sites/Widgets/Commands.php | 5 +++-- .../Pages/Servers/Sites/Widgets/DeploymentsList.php | 3 ++- app/Web/Pages/Servers/Sites/Widgets/SitesList.php | 3 ++- app/Web/Pages/Servers/View.php | 5 +++-- app/Web/Pages/Servers/Widgets/ServersList.php | 5 +++-- app/Web/Pages/Settings/APIKeys/Index.php | 5 +++-- .../Pages/Settings/APIKeys/Widgets/ApiKeysList.php | 5 +++-- .../Settings/NotificationChannels/Actions/Create.php | 3 ++- .../Settings/NotificationChannels/Actions/Edit.php | 3 ++- .../Pages/Settings/Profile/Widgets/BrowserSession.php | 7 ++++--- .../Settings/Profile/Widgets/ProfileInformation.php | 7 ++++--- app/Web/Pages/Settings/Profile/Widgets/TwoFactor.php | 11 ++++++----- app/Web/Pages/Settings/Projects/Index.php | 5 +++-- .../Pages/Settings/Projects/Widgets/ProjectsList.php | 3 ++- .../Pages/Settings/Projects/Widgets/SelectProject.php | 5 +++-- app/Web/Pages/Settings/SSHKeys/Index.php | 5 +++-- .../Pages/Settings/SSHKeys/Widgets/SshKeysList.php | 3 ++- app/Web/Pages/Settings/Tags/Actions/Create.php | 3 ++- app/Web/Pages/Settings/Users/Widgets/UsersList.php | 6 +++--- 43 files changed, 122 insertions(+), 76 deletions(-) diff --git a/app/Http/Controllers/API/ProjectController.php b/app/Http/Controllers/API/ProjectController.php index 0a2aebe..1b4ff4e 100644 --- a/app/Http/Controllers/API/ProjectController.php +++ b/app/Http/Controllers/API/ProjectController.php @@ -8,6 +8,7 @@ use App\Http\Controllers\Controller; use App\Http\Resources\ProjectResource; use App\Models\Project; +use App\Models\User; use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\ResourceCollection; use Illuminate\Http\Response; @@ -45,7 +46,7 @@ public function create(Request $request): ProjectResource $this->validate($request, CreateProject::rules()); - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); $project = app(CreateProject::class)->create($user, $request->all()); @@ -84,7 +85,7 @@ public function delete(Project $project): Response { $this->authorize('delete', $project); - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); app(DeleteProject::class)->delete($user, $project); diff --git a/app/Http/Controllers/API/ServerController.php b/app/Http/Controllers/API/ServerController.php index 920d3b1..0fb4225 100644 --- a/app/Http/Controllers/API/ServerController.php +++ b/app/Http/Controllers/API/ServerController.php @@ -13,6 +13,7 @@ use App\Http\Resources\ServerResource; use App\Models\Project; use App\Models\Server; +use App\Models\User; use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\ResourceCollection; use Knuckles\Scribe\Attributes\BodyParam; @@ -61,7 +62,7 @@ public function create(Request $request, Project $project): ServerResource $this->validate($request, CreateServer::rules($project, $request->input())); - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); $server = app(CreateServer::class)->create($user, $project, $request->all()); diff --git a/app/Http/Controllers/API/ServerProviderController.php b/app/Http/Controllers/API/ServerProviderController.php index e9b44c4..2ca3bfc 100644 --- a/app/Http/Controllers/API/ServerProviderController.php +++ b/app/Http/Controllers/API/ServerProviderController.php @@ -9,6 +9,7 @@ use App\Http\Resources\ServerProviderResource; use App\Models\Project; use App\Models\ServerProvider; +use App\Models\User; use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\ResourceCollection; use Knuckles\Scribe\Attributes\BodyParam; @@ -54,7 +55,7 @@ public function create(Request $request, Project $project): ServerProviderResour $this->validate($request, CreateServerProvider::rules($request->all())); - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); $serverProvider = app(CreateServerProvider::class)->create($user, $project, $request->all()); @@ -64,7 +65,7 @@ public function create(Request $request, Project $project): ServerProviderResour #[Get('{serverProvider}', name: 'api.projects.server-providers.show', middleware: 'ability:read')] #[Endpoint(title: 'show')] #[ResponseFromApiResource(ServerProviderResource::class, ServerProvider::class)] - public function show(Project $project, ServerProvider $serverProvider): \App\Http\Resources\ServerProviderResource + public function show(Project $project, ServerProvider $serverProvider): ServerProviderResource { $this->authorize('view', $serverProvider); @@ -78,7 +79,7 @@ public function show(Project $project, ServerProvider $serverProvider): \App\Htt #[BodyParam(name: 'name', description: 'The name of the server provider.', required: true)] #[BodyParam(name: 'global', description: 'Accessible in all projects', enum: [true, false])] #[ResponseFromApiResource(ServerProviderResource::class, ServerProvider::class)] - public function update(Request $request, Project $project, ServerProvider $serverProvider): \App\Http\Resources\ServerProviderResource + public function update(Request $request, Project $project, ServerProvider $serverProvider): ServerProviderResource { $this->authorize('update', $serverProvider); diff --git a/app/Http/Controllers/API/ServerSSHKeyController.php b/app/Http/Controllers/API/ServerSSHKeyController.php index c184e5e..ceae773 100644 --- a/app/Http/Controllers/API/ServerSSHKeyController.php +++ b/app/Http/Controllers/API/ServerSSHKeyController.php @@ -10,6 +10,7 @@ use App\Models\Project; use App\Models\Server; use App\Models\SshKey; +use App\Models\User; use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\ResourceCollection; use Knuckles\Scribe\Attributes\BodyParam; @@ -52,7 +53,7 @@ public function create(Request $request, Project $project, Server $server): SshK $this->validateRoute($project, $server); - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); $sshKey = null; diff --git a/app/Http/Controllers/API/StorageProviderController.php b/app/Http/Controllers/API/StorageProviderController.php index 5dd2f27..2e91bbe 100644 --- a/app/Http/Controllers/API/StorageProviderController.php +++ b/app/Http/Controllers/API/StorageProviderController.php @@ -9,6 +9,7 @@ use App\Http\Resources\StorageProviderResource; use App\Models\Project; use App\Models\StorageProvider; +use App\Models\User; use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\ResourceCollection; use Knuckles\Scribe\Attributes\BodyParam; @@ -54,7 +55,7 @@ public function create(Request $request, Project $project): StorageProviderResou $this->validate($request, CreateStorageProvider::rules($request->all())); - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); $storageProvider = app(CreateStorageProvider::class)->create($user, $project, $request->all()); @@ -64,7 +65,7 @@ public function create(Request $request, Project $project): StorageProviderResou #[Get('{storageProvider}', name: 'api.projects.storage-providers.show', middleware: 'ability:read')] #[Endpoint(title: 'show')] #[ResponseFromApiResource(StorageProviderResource::class, StorageProvider::class)] - public function show(Project $project, StorageProvider $storageProvider): \App\Http\Resources\StorageProviderResource + public function show(Project $project, StorageProvider $storageProvider): StorageProviderResource { $this->authorize('view', $storageProvider); @@ -78,7 +79,7 @@ public function show(Project $project, StorageProvider $storageProvider): \App\H #[BodyParam(name: 'name', description: 'The name of the storage provider.', required: true)] #[BodyParam(name: 'global', description: 'Accessible in all projects', enum: [true, false])] #[ResponseFromApiResource(StorageProviderResource::class, StorageProvider::class)] - public function update(Request $request, Project $project, StorageProvider $storageProvider): \App\Http\Resources\StorageProviderResource + public function update(Request $request, Project $project, StorageProvider $storageProvider): StorageProviderResource { $this->authorize('update', $storageProvider); diff --git a/app/Web/Pages/Scripts/Index.php b/app/Web/Pages/Scripts/Index.php index e849e1b..f49929c 100644 --- a/app/Web/Pages/Scripts/Index.php +++ b/app/Web/Pages/Scripts/Index.php @@ -4,6 +4,7 @@ use App\Actions\Script\CreateScript; use App\Models\Script; +use App\Models\User; use App\Web\Components\Page; use App\Web\Fields\CodeEditorField; use Filament\Actions\Action; @@ -40,7 +41,7 @@ public function getWidgets(): array protected function getHeaderActions(): array { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return [ diff --git a/app/Web/Pages/Servers/CronJobs/Widgets/CronJobsList.php b/app/Web/Pages/Servers/CronJobs/Widgets/CronJobsList.php index 7297dc1..77a38b1 100644 --- a/app/Web/Pages/Servers/CronJobs/Widgets/CronJobsList.php +++ b/app/Web/Pages/Servers/CronJobs/Widgets/CronJobsList.php @@ -7,6 +7,8 @@ use App\Actions\CronJob\EnableCronJob; use App\Models\CronJob; use App\Models\Server; +use App\Models\User; +use Exception; use Filament\Notifications\Notification; use Filament\Tables\Actions\Action; use Filament\Tables\Columns\TextColumn; @@ -58,7 +60,7 @@ protected function getTableColumns(): array public function table(Table $table): Table { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return $table @@ -100,7 +102,7 @@ public function table(Table $table): Table ->action(function (CronJob $record): void { try { app(DeleteCronJob::class)->delete($this->server, $record); - } catch (\Exception $e) { + } catch (Exception $e) { Notification::make() ->danger() ->title($e->getMessage()) diff --git a/app/Web/Pages/Servers/Databases/Backups.php b/app/Web/Pages/Servers/Databases/Backups.php index dcb73a0..a2da030 100644 --- a/app/Web/Pages/Servers/Databases/Backups.php +++ b/app/Web/Pages/Servers/Databases/Backups.php @@ -5,6 +5,7 @@ use App\Actions\Database\ManageBackup; use App\Models\Backup; use App\Models\StorageProvider; +use App\Models\User; use App\Web\Contracts\HasSecondSubNav; use App\Web\Pages\Servers\Page; use App\Web\Pages\Settings\StorageProviders\Actions\Create; @@ -29,7 +30,7 @@ public function mount(): void protected function getHeaderActions(): array { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return [ diff --git a/app/Web/Pages/Servers/Databases/Traits/Navigation.php b/app/Web/Pages/Servers/Databases/Traits/Navigation.php index dc9d355..2a9af73 100644 --- a/app/Web/Pages/Servers/Databases/Traits/Navigation.php +++ b/app/Web/Pages/Servers/Databases/Traits/Navigation.php @@ -5,6 +5,7 @@ use App\Models\Backup; use App\Models\Database; use App\Models\DatabaseUser; +use App\Models\User; use App\Web\Pages\Servers\Databases\Backups; use App\Web\Pages\Servers\Databases\Index as Databases; use App\Web\Pages\Servers\Databases\Users; @@ -15,7 +16,7 @@ trait Navigation { public function getSecondSubNavigation(): array { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); $items = []; diff --git a/app/Web/Pages/Servers/Databases/Widgets/BackupFilesList.php b/app/Web/Pages/Servers/Databases/Widgets/BackupFilesList.php index fe56712..9cace5d 100644 --- a/app/Web/Pages/Servers/Databases/Widgets/BackupFilesList.php +++ b/app/Web/Pages/Servers/Databases/Widgets/BackupFilesList.php @@ -7,6 +7,7 @@ use App\Models\Backup; use App\Models\BackupFile; use App\Models\Database; +use App\Models\User; use Filament\Forms\Components\Select; use Filament\Notifications\Notification; use Filament\Support\Enums\MaxWidth; @@ -68,7 +69,7 @@ protected function applyDefaultSortingToTableQuery(Builder $query): Builder public function table(Table $table): Table { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return $table diff --git a/app/Web/Pages/Servers/Databases/Widgets/BackupsList.php b/app/Web/Pages/Servers/Databases/Widgets/BackupsList.php index 804c4e7..be87850 100644 --- a/app/Web/Pages/Servers/Databases/Widgets/BackupsList.php +++ b/app/Web/Pages/Servers/Databases/Widgets/BackupsList.php @@ -7,6 +7,7 @@ use App\Models\Backup; use App\Models\BackupFile; use App\Models\Server; +use App\Models\User; use Filament\Forms\Components\Select; use Filament\Forms\Components\TextInput; use Filament\Notifications\Notification; @@ -62,7 +63,7 @@ protected function getTableColumns(): array public function table(Table $table): Table { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return $table diff --git a/app/Web/Pages/Servers/Databases/Widgets/DatabaseUsersList.php b/app/Web/Pages/Servers/Databases/Widgets/DatabaseUsersList.php index 9598a90..068de7c 100644 --- a/app/Web/Pages/Servers/Databases/Widgets/DatabaseUsersList.php +++ b/app/Web/Pages/Servers/Databases/Widgets/DatabaseUsersList.php @@ -6,6 +6,7 @@ use App\Actions\Database\LinkUser; use App\Models\DatabaseUser; use App\Models\Server; +use App\Models\User; use Filament\Forms\Components\CheckboxList; use Filament\Forms\Components\TextInput; use Filament\Notifications\Notification; @@ -65,7 +66,7 @@ public function table(Table $table): Table private function passwordAction(): Action { - /** @var \App\Models\User */ + /** @var User $user */ $user = auth()->user(); return Action::make('password') @@ -91,7 +92,7 @@ private function passwordAction(): Action private function linkAction(): Action { - /** @var \App\Models\User */ + /** @var User $user */ $user = auth()->user(); return Action::make('link') @@ -123,7 +124,7 @@ private function linkAction(): Action private function deleteAction(): Action { - /** @var \App\Models\User */ + /** @var User $user */ $user = auth()->user(); return Action::make('delete') diff --git a/app/Web/Pages/Servers/Databases/Widgets/DatabasesList.php b/app/Web/Pages/Servers/Databases/Widgets/DatabasesList.php index d81ca5d..e32e95d 100644 --- a/app/Web/Pages/Servers/Databases/Widgets/DatabasesList.php +++ b/app/Web/Pages/Servers/Databases/Widgets/DatabasesList.php @@ -5,6 +5,7 @@ use App\Actions\Database\DeleteDatabase; use App\Models\Database; use App\Models\Server; +use App\Models\User; use Filament\Tables\Actions\Action; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Table; @@ -53,7 +54,7 @@ protected function getTableColumns(): array public function table(Table $table): Table { - /** @var \App\Models\User */ + /** @var User $user */ $user = auth()->user(); return $table diff --git a/app/Web/Pages/Servers/FileManager/Widgets/FilesList.php b/app/Web/Pages/Servers/FileManager/Widgets/FilesList.php index 58d4eb2..5c06837 100644 --- a/app/Web/Pages/Servers/FileManager/Widgets/FilesList.php +++ b/app/Web/Pages/Servers/FileManager/Widgets/FilesList.php @@ -6,6 +6,7 @@ use App\Exceptions\SSHError; use App\Models\File; use App\Models\Server; +use App\Models\User; use App\Web\Fields\CodeEditorField; use App\Web\Pages\Servers\FileManager\Index; use Filament\Forms\Components\FileUpload; @@ -145,7 +146,7 @@ public function changeUser(string $user): void public function refresh(): void { - /** @var \App\Models\User */ + /** @var User $user */ $user = auth()->user(); try { diff --git a/app/Web/Pages/Servers/Firewall/Widgets/RulesList.php b/app/Web/Pages/Servers/Firewall/Widgets/RulesList.php index 8125071..797fed2 100644 --- a/app/Web/Pages/Servers/Firewall/Widgets/RulesList.php +++ b/app/Web/Pages/Servers/Firewall/Widgets/RulesList.php @@ -5,7 +5,9 @@ use App\Actions\FirewallRule\ManageRule; use App\Models\FirewallRule; use App\Models\Server; +use App\Models\User; use App\Web\Pages\Servers\Firewall\Index; +use Exception; use Filament\Notifications\Notification; use Filament\Support\Enums\MaxWidth; use Filament\Tables\Actions\Action; @@ -74,7 +76,7 @@ protected function getTableColumns(): array public function table(Table $table): Table { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return $table @@ -114,7 +116,7 @@ public function table(Table $table): Table ->action(function (FirewallRule $record): void { try { app(ManageRule::class)->delete($record); - } catch (\Exception $e) { + } catch (Exception $e) { Notification::make() ->danger() ->title($e->getMessage()) diff --git a/app/Web/Pages/Servers/Logs/Traits/Navigation.php b/app/Web/Pages/Servers/Logs/Traits/Navigation.php index 3f3d871..50ef459 100644 --- a/app/Web/Pages/Servers/Logs/Traits/Navigation.php +++ b/app/Web/Pages/Servers/Logs/Traits/Navigation.php @@ -3,6 +3,7 @@ namespace App\Web\Pages\Servers\Logs\Traits; use App\Models\ServerLog; +use App\Models\User; use App\Web\Pages\Servers\Logs\Index; use App\Web\Pages\Servers\Logs\RemoteLogs; use Filament\Navigation\NavigationGroup; @@ -12,7 +13,7 @@ trait Navigation { public function getSecondSubNavigation(): array { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); $items = []; diff --git a/app/Web/Pages/Servers/Logs/Widgets/LogsList.php b/app/Web/Pages/Servers/Logs/Widgets/LogsList.php index 54dd7e1..ad499db 100644 --- a/app/Web/Pages/Servers/Logs/Widgets/LogsList.php +++ b/app/Web/Pages/Servers/Logs/Widgets/LogsList.php @@ -5,6 +5,7 @@ use App\Models\Server; use App\Models\ServerLog; use App\Models\Site; +use App\Models\User; use Exception; use Filament\Forms\Components\DatePicker; use Filament\Tables\Actions\Action; @@ -16,6 +17,7 @@ use Filament\Widgets\TableWidget as Widget; use Illuminate\Database\Eloquent\Builder; use Illuminate\View\ComponentAttributeBag; +use Symfony\Component\HttpFoundation\StreamedResponse; class LogsList extends Widget { @@ -38,7 +40,7 @@ protected function getTableQuery(): Builder return ServerLog::query() ->where('server_id', $this->server->id) ->where(function (Builder $query): void { - if ($this->site instanceof \App\Models\Site) { + if ($this->site instanceof Site) { $query->where('site_id', $this->site->id); } }) @@ -73,7 +75,7 @@ protected function applyDefaultSortingToTableQuery(Builder $query): Builder */ public function table(Table $table): Table { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return $table @@ -115,7 +117,7 @@ public function table(Table $table): Table ->color('gray') ->icon('heroicon-o-archive-box-arrow-down') ->authorize(fn ($record) => $user->can('view', $record)) - ->action(fn (ServerLog $record): \Symfony\Component\HttpFoundation\StreamedResponse => $record->download()), + ->action(fn (ServerLog $record): StreamedResponse => $record->download()), DeleteAction::make() ->hiddenLabel() ->tooltip('Delete') diff --git a/app/Web/Pages/Servers/Page.php b/app/Web/Pages/Servers/Page.php index ca2ce60..055a4c1 100644 --- a/app/Web/Pages/Servers/Page.php +++ b/app/Web/Pages/Servers/Page.php @@ -11,6 +11,7 @@ use App\Models\Service; use App\Models\Site; use App\Models\SshKey; +use App\Models\User; use App\Web\Components\Page as BasePage; use App\Web\Pages\Servers\Console\Index as ConsoleIndex; use App\Web\Pages\Servers\CronJobs\Index as CronJobsIndex; @@ -37,7 +38,7 @@ abstract class Page extends BasePage public function getSubNavigation(): array { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); $items = []; diff --git a/app/Web/Pages/Servers/SSHKeys/Index.php b/app/Web/Pages/Servers/SSHKeys/Index.php index 38fe202..7353cc8 100644 --- a/app/Web/Pages/Servers/SSHKeys/Index.php +++ b/app/Web/Pages/Servers/SSHKeys/Index.php @@ -5,6 +5,7 @@ use App\Actions\SshKey\CreateSshKey; use App\Actions\SshKey\DeployKeyToServer; use App\Models\SshKey; +use App\Models\User; use App\Web\Pages\Servers\Page; use Exception; use Filament\Actions\Action; @@ -34,7 +35,7 @@ public function getWidgets(): array protected function getHeaderActions(): array { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return [ diff --git a/app/Web/Pages/Servers/SSHKeys/Widgets/SshKeysList.php b/app/Web/Pages/Servers/SSHKeys/Widgets/SshKeysList.php index 0349bcf..9617fbd 100644 --- a/app/Web/Pages/Servers/SSHKeys/Widgets/SshKeysList.php +++ b/app/Web/Pages/Servers/SSHKeys/Widgets/SshKeysList.php @@ -5,6 +5,7 @@ use App\Actions\SshKey\DeleteKeyFromServer; use App\Models\Server; use App\Models\SshKey; +use App\Models\User; use Exception; use Filament\Notifications\Notification; use Filament\Tables\Actions\DeleteAction; @@ -50,7 +51,7 @@ protected function getTableColumns(): array public function table(Table $table): Table { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return $table diff --git a/app/Web/Pages/Servers/Settings.php b/app/Web/Pages/Servers/Settings.php index 9e5cbce..b4eb57a 100644 --- a/app/Web/Pages/Servers/Settings.php +++ b/app/Web/Pages/Servers/Settings.php @@ -4,10 +4,12 @@ use App\Actions\Server\RebootServer; use App\Models\Server; +use App\Models\User; use App\Web\Pages\Servers\Widgets\ServerDetails; use App\Web\Pages\Servers\Widgets\UpdateServerInfo; use Filament\Actions\Action; use Filament\Notifications\Notification; +use Throwable; class Settings extends Page { @@ -24,7 +26,7 @@ class Settings extends Page public function mount(): void { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); $this->authorize('update', [$this->server, $user->currentProject]); @@ -62,7 +64,7 @@ protected function getHeaderActions(): array ->send(); $this->redirect(Index::getUrl()); - } catch (\Throwable $e) { + } catch (Throwable $e) { Notification::make() ->danger() ->title($e->getMessage()) diff --git a/app/Web/Pages/Servers/Sites/Page.php b/app/Web/Pages/Servers/Sites/Page.php index 84aadf3..b65bd31 100644 --- a/app/Web/Pages/Servers/Sites/Page.php +++ b/app/Web/Pages/Servers/Sites/Page.php @@ -6,6 +6,7 @@ use App\Models\ServerLog; use App\Models\Site; use App\Models\Ssl; +use App\Models\User; use App\Web\Contracts\HasSecondSubNav; use App\Web\Pages\Servers\Page as BasePage; use App\Web\Pages\Servers\Sites\Widgets\SiteSummary; @@ -20,7 +21,7 @@ abstract class Page extends BasePage implements HasSecondSubNav public function getSecondSubNavigation(): array { - /** @var \App\Models\User */ + /** @var User $user */ $user = auth()->user(); $items = []; diff --git a/app/Web/Pages/Servers/Sites/Pages/Queues/Widgets/QueuesList.php b/app/Web/Pages/Servers/Sites/Pages/Queues/Widgets/QueuesList.php index 941bccf..f0bae5c 100644 --- a/app/Web/Pages/Servers/Sites/Pages/Queues/Widgets/QueuesList.php +++ b/app/Web/Pages/Servers/Sites/Pages/Queues/Widgets/QueuesList.php @@ -8,6 +8,7 @@ use App\Actions\Queue\ManageQueue; use App\Models\Queue; use App\Models\Site; +use App\Models\User; use Filament\Forms\Components\Checkbox; use Filament\Forms\Components\Grid; use Filament\Forms\Components\Select; @@ -81,7 +82,7 @@ public function table(Table $table): Table private function operationAction(string $type, string $icon): Action { - /** @var \App\Models\User */ + /** @var User $user */ $user = auth()->user(); return Action::make($type) @@ -98,7 +99,7 @@ private function operationAction(string $type, string $icon): Action private function logsAction(): Action { - /** @var \App\Models\User */ + /** @var User $user */ $user = auth()->user(); return Action::make('logs') @@ -115,7 +116,7 @@ private function logsAction(): Action private function editAction(): Action { - /** @var \App\Models\User */ + /** @var User $user */ $user = auth()->user(); return EditAction::make('edit') @@ -161,7 +162,7 @@ private function editAction(): Action private function deleteAction(): Action { - /** @var \App\Models\User */ + /** @var User $user */ $user = auth()->user(); return DeleteAction::make('delete') diff --git a/app/Web/Pages/Servers/Sites/Pages/SSL/Widgets/SslsList.php b/app/Web/Pages/Servers/Sites/Pages/SSL/Widgets/SslsList.php index 25e864d..d0744c6 100644 --- a/app/Web/Pages/Servers/Sites/Pages/SSL/Widgets/SslsList.php +++ b/app/Web/Pages/Servers/Sites/Pages/SSL/Widgets/SslsList.php @@ -6,6 +6,7 @@ use App\Actions\SSL\DeleteSSL; use App\Models\Site; use App\Models\Ssl; +use App\Models\User; use Filament\Notifications\Notification; use Filament\Tables\Actions\Action; use Filament\Tables\Actions\DeleteAction; @@ -61,7 +62,7 @@ protected function getTableColumns(): array public function table(Table $table): Table { - /** @var \App\Models\User */ + /** @var User $user */ $user = auth()->user(); return $table diff --git a/app/Web/Pages/Servers/Sites/Widgets/Commands.php b/app/Web/Pages/Servers/Sites/Widgets/Commands.php index b544297..decbfa2 100644 --- a/app/Web/Pages/Servers/Sites/Widgets/Commands.php +++ b/app/Web/Pages/Servers/Sites/Widgets/Commands.php @@ -8,6 +8,7 @@ use App\Models\Command; use App\Models\CommandExecution; use App\Models\Site; +use App\Models\User; use Filament\Forms\Components\TextInput; use Filament\Forms\Get; use Filament\Notifications\Notification; @@ -69,7 +70,7 @@ protected function getTableColumns(): array protected function getTableHeaderActions(): array { - /** @var \App\Models\User */ + /** @var User $user */ $user = auth()->user(); return [ @@ -107,7 +108,7 @@ protected function getTableHeaderActions(): array public function table(Table $table): Table { - /** @var \App\Models\User */ + /** @var User $user */ $user = auth()->user(); return $table diff --git a/app/Web/Pages/Servers/Sites/Widgets/DeploymentsList.php b/app/Web/Pages/Servers/Sites/Widgets/DeploymentsList.php index cc2a202..f97f045 100644 --- a/app/Web/Pages/Servers/Sites/Widgets/DeploymentsList.php +++ b/app/Web/Pages/Servers/Sites/Widgets/DeploymentsList.php @@ -4,6 +4,7 @@ use App\Models\Deployment; use App\Models\Site; +use App\Models\User; use Filament\Tables\Actions\Action; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Table; @@ -63,7 +64,7 @@ protected function getTableColumns(): array public function table(Table $table): Table { - /** @var \App\Models\User */ + /** @var User $user */ $user = auth()->user(); return $table diff --git a/app/Web/Pages/Servers/Sites/Widgets/SitesList.php b/app/Web/Pages/Servers/Sites/Widgets/SitesList.php index 5cabaa5..2d08171 100644 --- a/app/Web/Pages/Servers/Sites/Widgets/SitesList.php +++ b/app/Web/Pages/Servers/Sites/Widgets/SitesList.php @@ -4,6 +4,7 @@ use App\Models\Server; use App\Models\Site; +use App\Models\User; use App\Web\Pages\Servers\Sites\Settings; use App\Web\Pages\Servers\Sites\View; use Filament\Tables\Actions\Action; @@ -57,7 +58,7 @@ protected function getTableColumns(): array public function table(Table $table): Table { - /** @var \App\Models\User */ + /** @var User $user */ $user = auth()->user(); return $table diff --git a/app/Web/Pages/Servers/View.php b/app/Web/Pages/Servers/View.php index 661a883..082ebc6 100644 --- a/app/Web/Pages/Servers/View.php +++ b/app/Web/Pages/Servers/View.php @@ -3,6 +3,7 @@ namespace App\Web\Pages\Servers; use App\Models\ServerLog; +use App\Models\User; use App\Web\Pages\Servers\Logs\Widgets\LogsList; use App\Web\Pages\Servers\Widgets\Installing; use App\Web\Pages\Servers\Widgets\ServerStats; @@ -18,7 +19,7 @@ class View extends Page public function mount(): void { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); $this->authorize('view', [$this->server, $user->currentProject]); @@ -39,7 +40,7 @@ public function refresh(): void public function getWidgets(): array { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); $widgets = []; diff --git a/app/Web/Pages/Servers/Widgets/ServersList.php b/app/Web/Pages/Servers/Widgets/ServersList.php index 9dd49a2..2fb8d4b 100644 --- a/app/Web/Pages/Servers/Widgets/ServersList.php +++ b/app/Web/Pages/Servers/Widgets/ServersList.php @@ -3,6 +3,7 @@ namespace App\Web\Pages\Servers\Widgets; use App\Models\Server; +use App\Models\User; use App\Web\Pages\Servers\Settings; use App\Web\Pages\Servers\View; use Filament\Tables\Actions\Action; @@ -19,7 +20,7 @@ class ServersList extends Widget */ protected function getTableQuery(): Builder { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return Server::query()->where('project_id', $user->current_project_id); @@ -59,7 +60,7 @@ protected function getTableColumns(): array public function table(Table $table): Table { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return $table diff --git a/app/Web/Pages/Settings/APIKeys/Index.php b/app/Web/Pages/Settings/APIKeys/Index.php index 3bcc2be..e41fe5a 100644 --- a/app/Web/Pages/Settings/APIKeys/Index.php +++ b/app/Web/Pages/Settings/APIKeys/Index.php @@ -3,6 +3,7 @@ namespace App\Web\Pages\Settings\APIKeys; use App\Models\PersonalAccessToken; +use App\Models\User; use App\Web\Components\Page; use Filament\Actions\Action; use Filament\Forms\Components\Radio; @@ -31,7 +32,7 @@ class Index extends Page public static function canAccess(): bool { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return $user->can('viewAny', PersonalAccessToken::class); @@ -53,7 +54,7 @@ public function unmountAction(bool $shouldCancelParentActions = true, bool $shou protected function getHeaderActions(): array { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return [ diff --git a/app/Web/Pages/Settings/APIKeys/Widgets/ApiKeysList.php b/app/Web/Pages/Settings/APIKeys/Widgets/ApiKeysList.php index 628b8d4..f2f625b 100644 --- a/app/Web/Pages/Settings/APIKeys/Widgets/ApiKeysList.php +++ b/app/Web/Pages/Settings/APIKeys/Widgets/ApiKeysList.php @@ -3,6 +3,7 @@ namespace App\Web\Pages\Settings\APIKeys\Widgets; use App\Models\PersonalAccessToken; +use App\Models\User; use Filament\Tables\Actions\DeleteAction; use Filament\Tables\Actions\DeleteBulkAction; use Filament\Tables\Columns\TextColumn; @@ -22,7 +23,7 @@ class ApiKeysList extends Widget */ protected function getTableQuery(): Builder { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); /** @var Builder $query */ @@ -55,7 +56,7 @@ protected function getTableColumns(): array public function table(Table $table): Table { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return $table diff --git a/app/Web/Pages/Settings/NotificationChannels/Actions/Create.php b/app/Web/Pages/Settings/NotificationChannels/Actions/Create.php index 87366c9..97ddfe3 100644 --- a/app/Web/Pages/Settings/NotificationChannels/Actions/Create.php +++ b/app/Web/Pages/Settings/NotificationChannels/Actions/Create.php @@ -3,6 +3,7 @@ namespace App\Web\Pages\Settings\NotificationChannels\Actions; use App\Actions\NotificationChannels\AddChannel; +use App\Models\User; use Exception; use Filament\Forms\Components\Checkbox; use Filament\Forms\Components\Select; @@ -57,7 +58,7 @@ public static function form(): array public static function action(array $data): void { try { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); app(AddChannel::class)->add($user, $data); } catch (Exception $e) { diff --git a/app/Web/Pages/Settings/NotificationChannels/Actions/Edit.php b/app/Web/Pages/Settings/NotificationChannels/Actions/Edit.php index a2d8759..09090f3 100644 --- a/app/Web/Pages/Settings/NotificationChannels/Actions/Edit.php +++ b/app/Web/Pages/Settings/NotificationChannels/Actions/Edit.php @@ -4,6 +4,7 @@ use App\Actions\NotificationChannels\EditChannel; use App\Models\NotificationChannel; +use App\Models\User; use Filament\Forms\Components\Checkbox; use Filament\Forms\Components\TextInput; use Filament\Forms\Get; @@ -28,7 +29,7 @@ public static function form(): array */ public static function action(NotificationChannel $channel, array $data): void { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); app(EditChannel::class)->edit($channel, $user, $data); } diff --git a/app/Web/Pages/Settings/Profile/Widgets/BrowserSession.php b/app/Web/Pages/Settings/Profile/Widgets/BrowserSession.php index 50af873..5bb790b 100644 --- a/app/Web/Pages/Settings/Profile/Widgets/BrowserSession.php +++ b/app/Web/Pages/Settings/Profile/Widgets/BrowserSession.php @@ -3,6 +3,7 @@ namespace App\Web\Pages\Settings\Profile\Widgets; use App\Helpers\Agent; +use App\Models\User; use Filament\Forms\Components\TextInput; use Filament\Forms\Concerns\InteractsWithForms; use Filament\Forms\Contracts\HasForms; @@ -111,7 +112,7 @@ private function getDynamicSchema(): array */ private function getSessions(): array { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = Auth::user(); if (config(key: 'session.driver') !== 'database') { @@ -151,7 +152,7 @@ private function createAgent(mixed $session): Agent private function logoutOtherBrowserSessions(string $password): void { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = Auth::user(); if (! Hash::check($password, $user->password)) { @@ -179,7 +180,7 @@ private function logoutOtherBrowserSessions(string $password): void private function deleteOtherSessionRecords(): void { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = Auth::user(); if (config(key: 'session.driver') !== 'database') { diff --git a/app/Web/Pages/Settings/Profile/Widgets/ProfileInformation.php b/app/Web/Pages/Settings/Profile/Widgets/ProfileInformation.php index 21e522c..030f2ec 100644 --- a/app/Web/Pages/Settings/Profile/Widgets/ProfileInformation.php +++ b/app/Web/Pages/Settings/Profile/Widgets/ProfileInformation.php @@ -3,6 +3,7 @@ namespace App\Web\Pages\Settings\Profile\Widgets; use App\Actions\User\UpdateUserProfileInformation; +use App\Models\User; use Filament\Forms\Components\Actions\Action; use Filament\Forms\Components\Section; use Filament\Forms\Components\Select; @@ -29,7 +30,7 @@ class ProfileInformation extends Widget implements HasForms public function mount(): void { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); $this->name = $user->name; $this->email = $user->email; @@ -38,7 +39,7 @@ public function mount(): void public function form(Form $form): Form { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); $rules = UpdateUserProfileInformation::rules($user); @@ -74,7 +75,7 @@ public function form(Form $form): Form public function submit(): void { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); $this->validate(); diff --git a/app/Web/Pages/Settings/Profile/Widgets/TwoFactor.php b/app/Web/Pages/Settings/Profile/Widgets/TwoFactor.php index d0ff845..8fa1e4c 100644 --- a/app/Web/Pages/Settings/Profile/Widgets/TwoFactor.php +++ b/app/Web/Pages/Settings/Profile/Widgets/TwoFactor.php @@ -2,6 +2,7 @@ namespace App\Web\Pages\Settings\Profile\Widgets; +use App\Models\User; use Filament\Forms\Concerns\InteractsWithForms; use Filament\Forms\Contracts\HasForms; use Filament\Infolists\Components\Actions\Action; @@ -37,7 +38,7 @@ class TwoFactor extends Widget implements HasForms, HasInfolists public function mount(): void { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); if ($user->two_factor_secret) { @@ -47,7 +48,7 @@ public function mount(): void public function infolist(Infolist $infolist): Infolist { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return $infolist->schema([ @@ -105,7 +106,7 @@ public function infolist(Infolist $infolist): Infolist public function enableTwoFactor(): void { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); app(EnableTwoFactorAuthentication::class)($user); @@ -123,7 +124,7 @@ public function enableTwoFactor(): void public function disableTwoFactor(): void { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); app(DisableTwoFactorAuthentication::class)($user); @@ -141,7 +142,7 @@ public function disableTwoFactor(): void public function regenerateRecoveryCodes(): void { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); app(GenerateNewRecoveryCodes::class)($user); diff --git a/app/Web/Pages/Settings/Projects/Index.php b/app/Web/Pages/Settings/Projects/Index.php index aa8b81e..a7a4baa 100644 --- a/app/Web/Pages/Settings/Projects/Index.php +++ b/app/Web/Pages/Settings/Projects/Index.php @@ -4,6 +4,7 @@ use App\Actions\Projects\CreateProject; use App\Models\Project; +use App\Models\User; use App\Web\Components\Page; use Filament\Actions\Action; use Filament\Forms\Components\TextInput; @@ -29,7 +30,7 @@ public static function getNavigationItemActiveRoutePattern(): string public static function canAccess(): bool { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return $user->can('viewAny', Project::class); @@ -50,7 +51,7 @@ protected function getHeaderActions(): array ->icon('heroicon-o-plus') ->authorize('create', Project::class) ->modalWidth(MaxWidth::Large) - ->form(fn (Form $form): \Filament\Forms\Form => $form->schema([ + ->form(fn (Form $form): Form => $form->schema([ TextInput::make('name') ->name('name') ->rules(CreateProject::rules()['name']), diff --git a/app/Web/Pages/Settings/Projects/Widgets/ProjectsList.php b/app/Web/Pages/Settings/Projects/Widgets/ProjectsList.php index 8fd4cd4..2e9887d 100644 --- a/app/Web/Pages/Settings/Projects/Widgets/ProjectsList.php +++ b/app/Web/Pages/Settings/Projects/Widgets/ProjectsList.php @@ -3,6 +3,7 @@ namespace App\Web\Pages\Settings\Projects\Widgets; use App\Models\Project; +use App\Models\User; use App\Web\Pages\Settings\Projects\Settings; use Filament\Tables\Actions\Action; use Filament\Tables\Columns\TextColumn; @@ -41,7 +42,7 @@ protected function getTableColumns(): array public function table(Table $table): Table { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return $table diff --git a/app/Web/Pages/Settings/Projects/Widgets/SelectProject.php b/app/Web/Pages/Settings/Projects/Widgets/SelectProject.php index 8021318..80a5d68 100644 --- a/app/Web/Pages/Settings/Projects/Widgets/SelectProject.php +++ b/app/Web/Pages/Settings/Projects/Widgets/SelectProject.php @@ -3,6 +3,7 @@ namespace App\Web\Pages\Settings\Projects\Widgets; use App\Models\Project; +use App\Models\User; use Filament\Widgets\Widget; use Illuminate\Support\Collection; @@ -21,7 +22,7 @@ class SelectProject extends Widget public function mount(): void { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); $this->currentProject = $user->currentProject; @@ -30,7 +31,7 @@ public function mount(): void public function updateProject(Project $project): void { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); $this->authorize('view', $project); diff --git a/app/Web/Pages/Settings/SSHKeys/Index.php b/app/Web/Pages/Settings/SSHKeys/Index.php index 4587559..de5cbe5 100644 --- a/app/Web/Pages/Settings/SSHKeys/Index.php +++ b/app/Web/Pages/Settings/SSHKeys/Index.php @@ -4,6 +4,7 @@ use App\Actions\SshKey\CreateSshKey; use App\Models\SshKey; +use App\Models\User; use App\Web\Components\Page; use Filament\Actions\CreateAction; use Filament\Forms\Components\Textarea; @@ -24,7 +25,7 @@ class Index extends Page public static function canAccess(): bool { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return $user->can('viewAny', SshKey::class); @@ -39,7 +40,7 @@ public function getWidgets(): array protected function getHeaderActions(): array { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return [ diff --git a/app/Web/Pages/Settings/SSHKeys/Widgets/SshKeysList.php b/app/Web/Pages/Settings/SSHKeys/Widgets/SshKeysList.php index a951c9e..4914384 100644 --- a/app/Web/Pages/Settings/SSHKeys/Widgets/SshKeysList.php +++ b/app/Web/Pages/Settings/SSHKeys/Widgets/SshKeysList.php @@ -3,6 +3,7 @@ namespace App\Web\Pages\Settings\SSHKeys\Widgets; use App\Models\SshKey; +use App\Models\User; use Filament\Tables\Actions\DeleteAction; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Table; @@ -41,7 +42,7 @@ protected function getTableColumns(): array public function table(Table $table): Table { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return $table diff --git a/app/Web/Pages/Settings/Tags/Actions/Create.php b/app/Web/Pages/Settings/Tags/Actions/Create.php index bffef97..249b0df 100644 --- a/app/Web/Pages/Settings/Tags/Actions/Create.php +++ b/app/Web/Pages/Settings/Tags/Actions/Create.php @@ -4,6 +4,7 @@ use App\Actions\Tag\CreateTag; use App\Models\Tag; +use App\Models\User; use Exception; use Filament\Forms\Components\Select; use Filament\Forms\Components\TextInput; @@ -41,7 +42,7 @@ public static function form(): array public static function action(array $data): Tag { try { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return app(CreateTag::class)->create($user, $data); diff --git a/app/Web/Pages/Settings/Users/Widgets/UsersList.php b/app/Web/Pages/Settings/Users/Widgets/UsersList.php index 43bee97..90371d8 100644 --- a/app/Web/Pages/Settings/Users/Widgets/UsersList.php +++ b/app/Web/Pages/Settings/Users/Widgets/UsersList.php @@ -47,7 +47,7 @@ protected function getTableColumns(): array public function table(Table $table): Table { - /** @var \App\Models\User $user */ + /** @var User $user */ $user = auth()->user(); return $table @@ -60,7 +60,7 @@ public function table(Table $table): Table ->using(function ($record, array $data): void { app(UpdateUser::class)->update($record, $data); }) - ->form(fn (Form $form, $record): \Filament\Forms\Form => $form + ->form(fn (Form $form, $record): Form => $form ->schema([ TextInput::make('name') ->rules(UpdateUser::rules($record)['name']), @@ -86,7 +86,7 @@ public function table(Table $table): Table ->label('Projects') ->icon('heroicon-o-rectangle-stack') ->authorize(fn ($record) => $user->can('update', $record)) - ->form(fn (Form $form, $record): \Filament\Forms\Form => $form + ->form(fn (Form $form, $record): Form => $form ->schema([ CheckboxList::make('projects') ->options(Project::query()->pluck('name', 'id')->toArray())