From b4c7b9b2010020225d48ea7f08f36333267e7750 Mon Sep 17 00:00:00 2001 From: fabiorodriguesroque Date: Mon, 11 Nov 2024 23:42:44 +0000 Subject: [PATCH] refactor: Filament Pages & ChangelogResource --- app/Filament/Pages/System.php | 11 +++++++++-- app/Filament/Pages/Widgets/System/SystemInfo.php | 5 ++++- app/Filament/Resources/ChangelogResource.php | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/Filament/Pages/System.php b/app/Filament/Pages/System.php index f9dc33ce..7949daaa 100644 --- a/app/Filament/Pages/System.php +++ b/app/Filament/Pages/System.php @@ -3,6 +3,7 @@ namespace App\Filament\Pages; use App\Enums\UserRole; +use App\Models\User; use Filament\Pages\Page; use Filament\Actions\Action; use App\Services\SystemChecker; @@ -36,12 +37,18 @@ public function getHeading(): string|Htmlable public static function shouldRegisterNavigation(): bool { - return auth()->user()->hasRole(UserRole::Admin); + /** @var User $user */ + $user = auth()->user(); + + return $user->hasRole(UserRole::Admin); } public function mount(): void { - abort_unless(auth()->user()->hasRole(UserRole::Admin), 403); + /** @var User $user */ + $user = auth()->user(); + + abort_unless($user->hasRole(UserRole::Admin), 403); } protected function getHeaderWidgets(): array diff --git a/app/Filament/Pages/Widgets/System/SystemInfo.php b/app/Filament/Pages/Widgets/System/SystemInfo.php index e4a200af..88fe2cef 100644 --- a/app/Filament/Pages/Widgets/System/SystemInfo.php +++ b/app/Filament/Pages/Widgets/System/SystemInfo.php @@ -11,6 +11,9 @@ class SystemInfo extends Widget protected int | string | array $columnSpan = 2; + /** + * @var array + */ public array $version = [ 'remoteVersion' => 0, 'currentVersion' => 0 @@ -18,7 +21,7 @@ class SystemInfo extends Widget public bool $isOutOfDate = false; public string $phpVersion = '8.1'; - public function mount() + public function mount(): void { $systemChecker = (new SystemChecker); diff --git a/app/Filament/Resources/ChangelogResource.php b/app/Filament/Resources/ChangelogResource.php index a86a3dd0..98c7ae06 100644 --- a/app/Filament/Resources/ChangelogResource.php +++ b/app/Filament/Resources/ChangelogResource.php @@ -73,7 +73,7 @@ public static function form(Form $form): Form Select::make('user_id') ->label(trans('resources.changelog.author')) ->relationship('user', 'name') - ->default(auth()->user()->id) + ->default(auth()->user()?->id) ->preload() ->required() ->searchable(),