From b30afaa23f0e1a05746a6de397998eb7861e29c2 Mon Sep 17 00:00:00 2001 From: Baspa Date: Mon, 19 May 2025 18:06:37 +0200 Subject: [PATCH 1/4] Use the MailAttachment model from the mails config --- src/Controllers/MailDownloadController.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Controllers/MailDownloadController.php b/src/Controllers/MailDownloadController.php index 50af302..a2cd853 100644 --- a/src/Controllers/MailDownloadController.php +++ b/src/Controllers/MailDownloadController.php @@ -4,7 +4,7 @@ use Illuminate\Routing\Controller; use Illuminate\Support\Facades\Storage; -use Vormkracht10\Mails\Models\MailAttachment; +use Illuminate\Support\Facades\Config; class MailDownloadController extends Controller { @@ -17,8 +17,9 @@ public function __invoke(...$arguments) $tenant = null; } - /** @var MailAttachment $attachment */ - $attachment = MailAttachment::find($attachment); + $attachmentModel = Config::get('mails.models.attachment'); + /** @var \Vormkracht10\Mails\Models\MailAttachment $attachment */ + $attachment = $attachmentModel::find($attachment); $file = Storage::disk($attachment->disk)->path($attachment->storagePath); From 3d05e9f77aa7027390c1d5e365cdd2d3439295b0 Mon Sep 17 00:00:00 2001 From: Baspa <10845460+Baspa@users.noreply.github.com> Date: Mon, 19 May 2025 16:06:57 +0000 Subject: [PATCH 2/4] Fix styling --- src/Controllers/MailDownloadController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controllers/MailDownloadController.php b/src/Controllers/MailDownloadController.php index a2cd853..f1c41fa 100644 --- a/src/Controllers/MailDownloadController.php +++ b/src/Controllers/MailDownloadController.php @@ -3,8 +3,8 @@ namespace Vormkracht10\FilamentMails\Controllers; use Illuminate\Routing\Controller; -use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Config; +use Illuminate\Support\Facades\Storage; class MailDownloadController extends Controller { From 96eca05ab524e7f3a4adbc175f9aa47ea42eae71 Mon Sep 17 00:00:00 2001 From: Baspa Date: Mon, 19 May 2025 18:08:02 +0200 Subject: [PATCH 3/4] Remove non existing path check --- phpstan.neon.dist | 1 - 1 file changed, 1 deletion(-) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 9f85c1e..540131b 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -6,7 +6,6 @@ parameters: paths: - src - config - - database tmpDir: build/phpstan checkOctaneCompatibility: true checkModelProperties: true From 2d440b2d146b71c052d118f7e98a8761426b6aa8 Mon Sep 17 00:00:00 2001 From: Baspa Date: Mon, 19 May 2025 18:15:20 +0200 Subject: [PATCH 4/4] Fix undefined property --- src/Resources/SuppressionResource.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resources/SuppressionResource.php b/src/Resources/SuppressionResource.php index cae96ab..53df0c6 100644 --- a/src/Resources/SuppressionResource.php +++ b/src/Resources/SuppressionResource.php @@ -125,7 +125,7 @@ public static function table(Table $table): Table Tables\Actions\Action::make('unsuppress') ->label(__('Unsuppress')) ->action(function (MailEvent $record) { - event(new MailUnsuppressed(key($record->to), $record->mail->mailer == 'smtp' && filled($record->mail->transport) ? $record->mail->transport : $record->mail->mailer, $record->mail->stream_id ?? null)); + event(new MailUnsuppressed(key($record->mail->to), $record->mail->mailer == 'smtp' && filled($record->mail->transport) ? $record->mail->transport : $record->mail->mailer, $record->mail->stream_id ?? null)); }) ->visible(fn ($record) => Provider::tryFrom($record->mail->mailer == 'smtp' && filled($record->mail->transport) ? $record->mail->transport : $record->mail->mailer)),