From 0c859ad27acf26b01518cb17c37607ab83ef83ee Mon Sep 17 00:00:00 2001 From: Marco Germani Date: Fri, 10 May 2024 03:01:38 +0200 Subject: [PATCH] Minor fixes --- database/factories/EmailFactory.php | 2 +- src/Filament/Resources/EmailResource.php | 4 ++-- src/FilamentEmailServiceProvider.php | 2 +- src/Listeners/FilamentEmailLogger.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/database/factories/EmailFactory.php b/database/factories/EmailFactory.php index de34ef4..0853eef 100644 --- a/database/factories/EmailFactory.php +++ b/database/factories/EmailFactory.php @@ -9,7 +9,7 @@ class EmailFactory extends Factory { public function modelName(): string { - return config('filament-email.resource.model', Email::class); + return config('filament-email.resource.model') ?? Email::class; } public function definition(): array diff --git a/src/Filament/Resources/EmailResource.php b/src/Filament/Resources/EmailResource.php index ab87ea0..4a2521d 100644 --- a/src/Filament/Resources/EmailResource.php +++ b/src/Filament/Resources/EmailResource.php @@ -47,7 +47,7 @@ public static function getNavigationLabel(): string public static function getNavigationIcon(): string|Htmlable|null { - return config('filament-email.resource.icon', 'heroicon-o-envelope'); + return config('filament-email.resource.icon') ?? 'heroicon-o-envelope'; } public static function getNavigationGroup(): ?string @@ -62,7 +62,7 @@ public static function getNavigationSort(): ?int public static function getModel(): string { - return config('filament-email.resource.model', Email::class); + return config('filament-email.resource.model') ?? Email::class; } public static function form(Form $form): Form diff --git a/src/FilamentEmailServiceProvider.php b/src/FilamentEmailServiceProvider.php index 755e3be..a02a5f6 100644 --- a/src/FilamentEmailServiceProvider.php +++ b/src/FilamentEmailServiceProvider.php @@ -37,7 +37,7 @@ public function bootingPackage() { $this->callAfterResolving(Schedule::class, function (Schedule $schedule) { $runCrontab = config('filament-email.prune_crontab', '0 0 * * *'); - $modelClass = config('filament-email.resource.model', Email::class); + $modelClass = config('filament-email.resource.model') ?? Email::class; $class = get_class(new $modelClass); if (class_exists($class)) { $schedule->command('model:prune --model="'.$class.'"') diff --git a/src/Listeners/FilamentEmailLogger.php b/src/Listeners/FilamentEmailLogger.php index 7e3c703..a5b0b9b 100644 --- a/src/Listeners/FilamentEmailLogger.php +++ b/src/Listeners/FilamentEmailLogger.php @@ -27,7 +27,7 @@ public function handle(object $event): void $rawMessage = $event->sent->getSymfonySentMessage(); $email = $event->message; - $model = config('filament-email.resource.model', Email::class); + $model = config('filament-email.resource.model') ?? Email::class; $attachments = []; $savePath = 'filament-email-log'.DIRECTORY_SEPARATOR.date('YmdHis').'_'.Str::random(5).DIRECTORY_SEPARATOR;