From 9116ffc792a8d91ce4b1f055594405eb2349d756 Mon Sep 17 00:00:00 2001
From: lukinovec <lukinovec@gmail.com>
Date: Wed, 2 Nov 2022 15:05:10 +0100
Subject: [PATCH] Add separate method to pick the appropriate mail credentials
 map preset

---
 src/Bootstrappers/MailTenancyBootstrapper.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Bootstrappers/MailTenancyBootstrapper.php b/src/Bootstrappers/MailTenancyBootstrapper.php
index 733e1d83..aec90b44 100644
--- a/src/Bootstrappers/MailTenancyBootstrapper.php
+++ b/src/Bootstrappers/MailTenancyBootstrapper.php
@@ -34,12 +34,15 @@ class MailTenancyBootstrapper implements TenancyBootstrapper
 
     public function __construct(protected Repository $config)
     {
-        $mapPreset = match ($config->get('mail.default')) {
+        static::$credentialsMap = array_merge(static::$credentialsMap, $this->pickMapPreset() ?? []);
+    }
+
+    protected function pickMapPreset(): array|null
+    {
+        return match ($this->config->get('mail.default')) {
             'smtp' => static::smtpCredentialsMap(),
             default => null,
         };
-
-        static::$credentialsMap = array_merge(static::$credentialsMap, $mapPreset ?? []);
     }
 
     public function bootstrap(Tenant $tenant): void