adjust MailManager to detect if smtp or smtps is needed by checking encryption (#53749)

danielrona · web-flow · commit c07f426e8bfb · 2024-12-06T13:14:47.000-06:00
diff --git a/src/Illuminate/Mail/MailManager.php b/src/Illuminate/Mail/MailManager.php
@@ -194,7 +194,9 @@ protected function createSmtpTransport(array $config)
         $scheme = $config['scheme'] ?? null;
 
         if (! $scheme) {
-            $scheme = ($config['port'] == 465) ? 'smtps' : 'smtp';
+            $scheme = ! empty($config['encryption']) && $config['encryption'] === 'tls'
+                ? 'smtps'
+                : 'smtp';
         }
 
         $transport = $factory->create(new Dsn(

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,9 @@ protected function createSmtpTransport(array $config)`
`194`	`194`	`$scheme = $config['scheme'] ?? null;`
`195`	`195`
`196`	`196`	`if (! $scheme) {`
`197`		`- $scheme = ($config['port'] == 465) ? 'smtps' : 'smtp';`
	`197`	`+ $scheme = ! empty($config['encryption']) && $config['encryption'] === 'tls'`
	`198`	`+ ? 'smtps'`
	`199`	`+ : 'smtp';`
`198`	`200`	`}`
`199`	`201`
`200`	`202`	`$transport = $factory->create(new Dsn(`