app: fix email config keys

app/Console/Commands/Environment/EmailSettingsCommand.php

@@ -67,12 +67,6 @@ class EmailSettingsCommand extends Command
             $this->config->get('mail.from.name')
         );
 
-        $this->variables['MAIL_ENCRYPTION'] = $this->option('encryption') ?? $this->choice(
-            trans('command/messages.environment.mail.ask_encryption'),
-            ['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'],
-            $this->config->get('mail.encryption', 'tls')
-        );
-
         $this->writeToEnvironment($this->variables);
 
         $this->line('Updating stored environment configuration file.');
@@ -102,6 +96,12 @@ class EmailSettingsCommand extends Command
         $this->variables['MAIL_PASSWORD'] = $this->option('password') ?? $this->secret(
             trans('command/messages.environment.mail.ask_smtp_password')
         );
+
+        $this->variables['MAIL_ENCRYPTION'] = $this->option('encryption') ?? $this->choice(
+            trans('command/messages.environment.mail.ask_encryption'),
+            ['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'],
+            $this->config->get('mail.mailers.smtp.encryption', 'tls')
+        );
     }
 
     /**

app/Providers/SettingsServiceProvider.php

@@ -37,13 +37,13 @@ class SettingsServiceProvider extends ServiceProvider
      * when using the SMTP driver.
      */
     protected array $emailKeys = [
-        'mail:host',
-        'mail:port',
+        'mail:mailers:smtp:host',
+        'mail:mailers:smtp:port',
+        'mail:mailers:smtp:encryption',
+        'mail:mailers:smtp:username',
+        'mail:mailers:smtp:password',
         'mail:from:address',
         'mail:from:name',
-        'mail:encryption',
-        'mail:username',
-        'mail:password',
     ];
 
     /**