From a0ad69a95cbd68bc49d46966d7623f64927a8d2f Mon Sep 17 00:00:00 2001 From: lukinovec Date: Fri, 4 Nov 2022 14:05:05 +0100 Subject: [PATCH] Use static property for map presets --- src/Bootstrappers/MailTenancyBootstrapper.php | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/Bootstrappers/MailTenancyBootstrapper.php b/src/Bootstrappers/MailTenancyBootstrapper.php index 2ff81974..8ef622f4 100644 --- a/src/Bootstrappers/MailTenancyBootstrapper.php +++ b/src/Bootstrappers/MailTenancyBootstrapper.php @@ -24,28 +24,19 @@ class MailTenancyBootstrapper implements TenancyBootstrapper protected array $originalConfig = []; - public static function smtpPreset(): array - { - return [ + public static array $mapPresets = [ + 'smtp' => [ 'mail.mailers.smtp.host' => 'smtp_host', 'mail.mailers.smtp.port' => 'smtp_port', 'mail.mailers.smtp.username' => 'smtp_username', 'mail.mailers.smtp.password' => 'smtp_password', - ]; - } + ], + ]; public function __construct(protected Repository $config) { static::$mailer ??= $config->get('mail.default'); - static::$credentialsMap = array_merge(static::$credentialsMap, $this->pickMapPreset() ?? []); - } - - protected function pickMapPreset(): array|null - { - return match (static::$mailer) { - 'smtp' => static::smtpPreset(), - default => null, - }; + static::$credentialsMap = array_merge(static::$credentialsMap, static::$mapPresets[static::$mailer] ?? []); } public function bootstrap(Tenant $tenant): void