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 diff --git a/src/Controllers/MailDownloadController.php b/src/Controllers/MailDownloadController.php index 50af302..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\Config; use Illuminate\Support\Facades\Storage; -use Vormkracht10\Mails\Models\MailAttachment; 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); 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)),