[Mailer][Smtp] Make 'auto_tls' work with any port number

srsbiz · srsbiz · commit 59a6796da2d2 · 2024-01-30T00:30:42.000+01:00
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportFactoryTest.php b/src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportFactoryTest.php
@@ -165,9 +165,19 @@ public static function createProvider(): iterable
             new Dsn('smtp', 'example.com', '', '', 25, ['auto_tls' => false]),
             $transport,
         ];
+        yield [
+            new Dsn('smtp', 'example.com', '', '', 0, ['auto_tls' => false]),
+            $transport,
+        ];
+        yield [
+            Dsn::fromString('smtp://:@example.com?auto_tls=false'),
+            $transport,
+        ];
 
+        $transport = new EsmtpTransport('example.com', 465, false, null, $logger);
+        $transport->setAutoTls(false);
         yield [
-            Dsn::fromString('smtp://:@example.com:25?auto_tls=false'),
+            Dsn::fromString('smtp://:@example.com:465?auto_tls=false'),
             $transport,
         ];
     }
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransportFactory.php b/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransportFactory.php
@@ -23,11 +23,17 @@ final class EsmtpTransportFactory extends AbstractTransportFactory
 {
     public function create(Dsn $dsn): TransportInterface
     {
-        $tls = 'smtps' === $dsn->getScheme() ? true : null;
+        if ('' !== $dsn->getOption('auto_tls')) {
+            $auto_tls = filter_var($dsn->getOption('auto_tls', true), \FILTER_VALIDATE_BOOL);
+        } else {
+            $auto_tls = true;
+        }
+        $tls = 'smtps' === $dsn->getScheme() ? true : ($auto_tls ? null : false);
         $port = $dsn->getPort(0);
         $host = $dsn->getHost();
 
         $transport = new EsmtpTransport($host, $port, $tls, $this->dispatcher, $this->logger);
+        $transport->setAutoTls($auto_tls);
 
         /** @var SocketStream $stream */
         $stream = $transport->getStream();
@@ -68,10 +74,6 @@ public function create(Dsn $dsn): TransportInterface
             $transport->setPingThreshold((int) $pingThreshold);
         }
 
-        if ('' !== $dsn->getOption('auto_tls') && !filter_var($dsn->getOption('auto_tls', true), \FILTER_VALIDATE_BOOL)) {
-            $transport->setAutoTls(false);
-        }
-
         return $transport;
     }
 
