From 11b3acf8fc2bcb6a72be8a76a454355650ba1df5 Mon Sep 17 00:00:00 2001 From: Charles Date: Tue, 24 Jun 2025 07:42:56 -0400 Subject: [PATCH] PHPStan --- app/Enums/BackupStatus.php | 2 +- app/Enums/ContainerStatus.php | 2 +- app/Filament/Admin/Pages/Health.php | 2 -- app/Filament/Admin/Pages/Settings.php | 2 ++ app/Filament/Admin/Resources/EggResource.php | 2 +- app/Filament/Admin/Resources/RoleResource.php | 2 +- app/Filament/Admin/Resources/UserResource.php | 8 +++++++- .../Admin/Resources/UserResource/Pages/ListUsers.php | 5 +++-- app/Filament/Admin/Resources/WebhookResource.php | 2 +- app/Traits/Filament/CanCustomizeHeaderActions.php | 11 ++++++++--- 10 files changed, 25 insertions(+), 13 deletions(-) diff --git a/app/Enums/BackupStatus.php b/app/Enums/BackupStatus.php index cc1dd30da..077fca54f 100644 --- a/app/Enums/BackupStatus.php +++ b/app/Enums/BackupStatus.php @@ -21,7 +21,7 @@ enum BackupStatus: string implements HasColor, HasIcon, HasLabel }; } - public function getColor(): ?string + public function getColor(): string { return match ($this) { self::InProgress => 'primary', diff --git a/app/Enums/ContainerStatus.php b/app/Enums/ContainerStatus.php index cdfa41be6..b83a61021 100644 --- a/app/Enums/ContainerStatus.php +++ b/app/Enums/ContainerStatus.php @@ -40,7 +40,7 @@ enum ContainerStatus: string implements HasColor, HasIcon, HasLabel }; } - public function getColor(bool $hex = false): ?string + public function getColor(bool $hex = false): string { if ($hex) { return match ($this) { diff --git a/app/Filament/Admin/Pages/Health.php b/app/Filament/Admin/Pages/Health.php index 47749ef91..7aa5e41de 100644 --- a/app/Filament/Admin/Pages/Health.php +++ b/app/Filament/Admin/Pages/Health.php @@ -17,8 +17,6 @@ class Health extends Page protected string $view = 'filament.pages.health'; - protected array $extraAttributes = []; - /** @var array */ protected $listeners = [ 'refresh-component' => '$refresh', diff --git a/app/Filament/Admin/Pages/Settings.php b/app/Filament/Admin/Pages/Settings.php index 61c4ab785..c18b9e52e 100644 --- a/app/Filament/Admin/Pages/Settings.php +++ b/app/Filament/Admin/Pages/Settings.php @@ -59,6 +59,7 @@ class Settings extends Page implements HasSchemas protected string $view = 'filament.pages.settings'; + /** @var array|null */ public ?array $data = []; public function mount(): void @@ -82,6 +83,7 @@ class Settings extends Page implements HasSchemas } /** + * @return array * @throws Exception */ protected function getFormSchema(): array diff --git a/app/Filament/Admin/Resources/EggResource.php b/app/Filament/Admin/Resources/EggResource.php index 433147bb9..45472d58c 100644 --- a/app/Filament/Admin/Resources/EggResource.php +++ b/app/Filament/Admin/Resources/EggResource.php @@ -26,7 +26,7 @@ class EggResource extends Resource public static function getNavigationBadge(): ?string { - return static::getModel()::count() ?: null; + return ($count = static::getModel()::count()) > 0 ? (string) $count : null; } public static function getNavigationGroup(): ?string diff --git a/app/Filament/Admin/Resources/RoleResource.php b/app/Filament/Admin/Resources/RoleResource.php index a7a268fd8..9b194636d 100644 --- a/app/Filament/Admin/Resources/RoleResource.php +++ b/app/Filament/Admin/Resources/RoleResource.php @@ -69,7 +69,7 @@ class RoleResource extends Resource public static function getNavigationBadge(): ?string { - return static::getModel()::count() ?: null; + return ($count = static::getModel()::count()) > 0 ? (string) $count : null; } /** diff --git a/app/Filament/Admin/Resources/UserResource.php b/app/Filament/Admin/Resources/UserResource.php index 0f2c07e81..a350cd304 100644 --- a/app/Filament/Admin/Resources/UserResource.php +++ b/app/Filament/Admin/Resources/UserResource.php @@ -13,9 +13,12 @@ use App\Traits\Filament\CanCustomizePages; use App\Traits\Filament\CanCustomizeRelations; use App\Traits\Filament\CanModifyForm; use App\Traits\Filament\CanModifyTable; +use Exception; use Filament\Facades\Filament; use Filament\Forms\Components\CheckboxList; use Filament\Forms\Components\TextInput; +use Filament\Resources\Pages\PageRegistration; +use Filament\Resources\RelationManagers\RelationManager; use Filament\Resources\Resource; use Filament\Actions\DeleteBulkAction; use Filament\Actions\EditAction; @@ -62,9 +65,12 @@ class UserResource extends Resource public static function getNavigationBadge(): ?string { - return static::getModel()::count() ?: null; + return ($count = static::getModel()::count()) > 0 ? (string) $count : null; } + /** + * @throws Exception + */ public static function defaultTable(Table $table): Table { return $table diff --git a/app/Filament/Admin/Resources/UserResource/Pages/ListUsers.php b/app/Filament/Admin/Resources/UserResource/Pages/ListUsers.php index fada451e0..9994d5108 100644 --- a/app/Filament/Admin/Resources/UserResource/Pages/ListUsers.php +++ b/app/Filament/Admin/Resources/UserResource/Pages/ListUsers.php @@ -5,10 +5,11 @@ namespace App\Filament\Admin\Resources\UserResource\Pages; use App\Filament\Admin\Resources\UserResource; use App\Traits\Filament\CanCustomizeHeaderActions; use App\Traits\Filament\CanCustomizeHeaderWidgets; +use Filament\Resources\Pages\ListRecords; use Filament\Actions\Action; use Filament\Actions\ActionGroup; use Filament\Actions\CreateAction; -use Filament\Resources\Pages\ListRecords; +use Filament\Actions\DeleteAction; class ListUsers extends ListRecords { @@ -17,7 +18,7 @@ class ListUsers extends ListRecords protected static string $resource = UserResource::class; - /** @return array */ + /** @return array */ protected function getDefaultHeaderActions(): array { return [ diff --git a/app/Filament/Admin/Resources/WebhookResource.php b/app/Filament/Admin/Resources/WebhookResource.php index 5a3a88bfa..8e82679d1 100644 --- a/app/Filament/Admin/Resources/WebhookResource.php +++ b/app/Filament/Admin/Resources/WebhookResource.php @@ -54,7 +54,7 @@ class WebhookResource extends Resource public static function getNavigationBadge(): ?string { - return static::getModel()::count() ?: null; + return ($count = static::getModel()::count()) > 0 ? (string) $count : null; } public static function getNavigationGroup(): ?string diff --git a/app/Traits/Filament/CanCustomizeHeaderActions.php b/app/Traits/Filament/CanCustomizeHeaderActions.php index a8dd5ecfc..7d2020733 100644 --- a/app/Traits/Filament/CanCustomizeHeaderActions.php +++ b/app/Traits/Filament/CanCustomizeHeaderActions.php @@ -3,12 +3,15 @@ namespace App\Traits\Filament; use App\Enums\HeaderActionPosition; +use Exception; use Filament\Actions\Action; use Filament\Actions\ActionGroup; +use Filament\Actions\CreateAction; +use Filament\Actions\DeleteAction; trait CanCustomizeHeaderActions { - /** @var array */ + /** @var array */ protected static array $customHeaderActions = []; public static function registerCustomHeaderActions(HeaderActionPosition $position, Action|ActionGroup ...$customHeaderActions): void @@ -16,13 +19,15 @@ trait CanCustomizeHeaderActions static::$customHeaderActions[$position->value] = array_merge(static::$customHeaderActions[$position->value] ?? [], $customHeaderActions); } - /** @return array */ + /** @return array */ protected function getDefaultHeaderActions(): array { return []; } - /** @return array */ + /** @return array + * @throws Exception + */ protected function getHeaderActions(): array { return array_merge(