[Mailer] simplified the way TLS/SSL/StartTls work

fabpot · fabpot · commit 1042a3cf6056 · 2019-08-19T11:00:57.000+02:00
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesTransportFactoryTest.php
@@ -43,6 +43,11 @@ public function supportsProvider(): iterable
             true,
         ];
 
+        yield [
+            new Dsn('smtps', 'ses'),
+            true,
+        ];
+
         yield [
             new Dsn('smtp', 'example.com'),
             false,
@@ -84,13 +89,18 @@ public function createProvider(): iterable
             new Dsn('smtp', 'ses', self::USER, self::PASSWORD, null, ['region' => 'eu-west-1']),
             new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', $dispatcher, $logger),
         ];
+
+        yield [
+            new Dsn('smtps', 'ses', self::USER, self::PASSWORD, null, ['region' => 'eu-west-1']),
+            new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', $dispatcher, $logger),
+        ];
     }
 
     public function unsupportedSchemeProvider(): iterable
     {
         yield [
             new Dsn('foo', 'ses', self::USER, self::PASSWORD),
-            'The "foo" scheme is not supported for mailer "ses". Supported schemes are: "api", "http", "smtp".',
+            'The "foo" scheme is not supported for mailer "ses". Supported schemes are: "api", "http", "smtp", "smtps".',
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesSmtpTransport.php
@@ -25,7 +25,7 @@ class SesSmtpTransport extends EsmtpTransport
      */
     public function __construct(string $username, string $password, string $region = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
-        parent::__construct(sprintf('email-smtp.%s.amazonaws.com', $region ?: 'eu-west-1'), 587, 'tls', null, $dispatcher, $logger);
+        parent::__construct(sprintf('email-smtp.%s.amazonaws.com', $region ?: 'eu-west-1'), 587, true, null, $dispatcher, $logger);
 
         $this->setUsername($username);
         $this->setPassword($password);
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesTransportFactory.php
@@ -36,11 +36,11 @@ public function create(Dsn $dsn): TransportInterface
             return new SesHttpTransport($user, $password, $region, $this->client, $this->dispatcher, $this->logger);
         }
 
-        if ('smtp' === $scheme) {
+        if ('smtp' === $scheme || 'smtps' === $scheme) {
             return new SesSmtpTransport($user, $password, $region, $this->dispatcher, $this->logger);
         }
 
-        throw new UnsupportedSchemeException($dsn, ['api', 'http', 'smtp']);
+        throw new UnsupportedSchemeException($dsn, ['api', 'http', 'smtp', 'smtps']);
     }
 
     public function supports(Dsn $dsn): bool
diff --git a/src/Symfony/Component/Mailer/Bridge/Google/Tests/Transport/GmailTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Google/Tests/Transport/GmailTransportFactoryTest.php
@@ -22,6 +22,11 @@ public function supportsProvider(): iterable
             true,
         ];
 
+        yield [
+            new Dsn('smtps', 'gmail'),
+            true,
+        ];
+
         yield [
             new Dsn('smtp', 'example.com'),
             false,
@@ -34,13 +39,18 @@ public function createProvider(): iterable
             new Dsn('smtp', 'gmail', self::USER, self::PASSWORD),
             new GmailSmtpTransport(self::USER, self::PASSWORD, $this->getDispatcher(), $this->getLogger()),
         ];
+
+        yield [
+            new Dsn('smtps', 'gmail', self::USER, self::PASSWORD),
+            new GmailSmtpTransport(self::USER, self::PASSWORD, $this->getDispatcher(), $this->getLogger()),
+        ];
     }
 
     public function unsupportedSchemeProvider(): iterable
     {
         yield [
             new Dsn('foo', 'gmail', self::USER, self::PASSWORD),
-            'The "foo" scheme is not supported for mailer "gmail". Supported schemes are: "smtp".',
+            'The "foo" scheme is not supported for mailer "gmail". Supported schemes are: "smtp", "smtps".',
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Google/Transport/GmailSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Google/Transport/GmailSmtpTransport.php
@@ -22,7 +22,7 @@ class GmailSmtpTransport extends EsmtpTransport
 {
     public function __construct(string $username, string $password, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
-        parent::__construct('smtp.gmail.com', 465, 'ssl', null, $dispatcher, $logger);
+        parent::__construct('smtp.gmail.com', 465, true, null, $dispatcher, $logger);
 
         $this->setUsername($username);
         $this->setPassword($password);
diff --git a/src/Symfony/Component/Mailer/Bridge/Google/Transport/GmailTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Google/Transport/GmailTransportFactory.php
@@ -23,11 +23,11 @@ final class GmailTransportFactory extends AbstractTransportFactory
 {
     public function create(Dsn $dsn): TransportInterface
     {
-        if ('smtp' === $dsn->getScheme()) {
+        if ('smtp' === $dsn->getScheme() || 'smtps' === $dsn->getScheme()) {
             return new GmailSmtpTransport($this->getUser($dsn), $this->getPassword($dsn), $this->dispatcher, $this->logger);
         }
 
-        throw new UnsupportedSchemeException($dsn, ['smtp']);
+        throw new UnsupportedSchemeException($dsn, ['smtp', 'smtps']);
     }
 
     public function supports(Dsn $dsn): bool
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillTransportFactoryTest.php
@@ -43,6 +43,11 @@ public function supportsProvider(): iterable
             true,
         ];
 
+        yield [
+            new Dsn('smtps', 'mandrill'),
+            true,
+        ];
+
         yield [
             new Dsn('smtp', 'example.com'),
             false,
@@ -69,13 +74,18 @@ public function createProvider(): iterable
             new Dsn('smtp', 'mandrill', self::USER, self::PASSWORD),
             new MandrillSmtpTransport(self::USER, self::PASSWORD, $dispatcher, $logger),
         ];
+
+        yield [
+            new Dsn('smtps', 'mandrill', self::USER, self::PASSWORD),
+            new MandrillSmtpTransport(self::USER, self::PASSWORD, $dispatcher, $logger),
+        ];
     }
 
     public function unsupportedSchemeProvider(): iterable
     {
         yield [
             new Dsn('foo', 'mandrill', self::USER),
-            'The "foo" scheme is not supported for mailer "mandrill". Supported schemes are: "api", "http", "smtp".',
+            'The "foo" scheme is not supported for mailer "mandrill". Supported schemes are: "api", "http", "smtp", "smtps".',
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillSmtpTransport.php
@@ -22,7 +22,7 @@ class MandrillSmtpTransport extends EsmtpTransport
 {
     public function __construct(string $username, string $password, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
-        parent::__construct('smtp.mandrillapp.com', 587, 'tls', null, $dispatcher, $logger);
+        parent::__construct('smtp.mandrillapp.com', 587, true, null, $dispatcher, $logger);
 
         $this->setUsername($username);
         $this->setPassword($password);
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillTransportFactory.php
@@ -34,13 +34,13 @@ public function create(Dsn $dsn): TransportInterface
             return new MandrillHttpTransport($user, $this->client, $this->dispatcher, $this->logger);
         }
 
-        if ('smtp' === $scheme) {
+        if ('smtp' === $scheme || 'smtps' === $scheme) {
             $password = $this->getPassword($dsn);
 
             return new MandrillSmtpTransport($user, $password, $this->dispatcher, $this->logger);
         }
 
-        throw new UnsupportedSchemeException($dsn, ['api', 'http', 'smtp']);
+        throw new UnsupportedSchemeException($dsn, ['api', 'http', 'smtp', 'smtps']);
     }
 
     public function supports(Dsn $dsn): bool
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php
@@ -43,6 +43,11 @@ public function supportsProvider(): iterable
             true,
         ];
 
+        yield [
+            new Dsn('smtps', 'mailgun'),
+            true,
+        ];
+
         yield [
             new Dsn('smtp', 'example.com'),
             false,
@@ -74,13 +79,18 @@ public function createProvider(): iterable
             new Dsn('smtp', 'mailgun', self::USER, self::PASSWORD),
             new MailgunSmtpTransport(self::USER, self::PASSWORD, null, $dispatcher, $logger),
         ];
+
+        yield [
+            new Dsn('smtps', 'mailgun', self::USER, self::PASSWORD),
+            new MailgunSmtpTransport(self::USER, self::PASSWORD, null, $dispatcher, $logger),
+        ];
     }
 
     public function unsupportedSchemeProvider(): iterable
     {
         yield [
             new Dsn('foo', 'mailgun', self::USER, self::PASSWORD),
-            'The "foo" scheme is not supported for mailer "mailgun". Supported schemes are: "api", "http", "smtp".',
+            'The "foo" scheme is not supported for mailer "mailgun". Supported schemes are: "api", "http", "smtp", "smtps".',
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php
@@ -22,7 +22,7 @@ class MailgunSmtpTransport extends EsmtpTransport
 {
     public function __construct(string $username, string $password, string $region = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
-        parent::__construct('us' !== ($region ?: 'us') ? sprintf('smtp.%s.mailgun.org', $region) : 'smtp.mailgun.org', 465, 'ssl', null, $dispatcher, $logger);
+        parent::__construct('us' !== ($region ?: 'us') ? sprintf('smtp.%s.mailgun.org', $region) : 'smtp.mailgun.org', 465, true, null, $dispatcher, $logger);
 
         $this->setUsername($username);
         $this->setPassword($password);
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunTransportFactory.php
@@ -36,11 +36,11 @@ public function create(Dsn $dsn): TransportInterface
             return new MailgunHttpTransport($user, $password, $region, $this->client, $this->dispatcher, $this->logger);
         }
 
-        if ('smtp' === $scheme) {
+        if ('smtp' === $scheme || 'smtps' === $scheme) {
             return new MailgunSmtpTransport($user, $password, $region, $this->dispatcher, $this->logger);
         }
 
-        throw new UnsupportedSchemeException($dsn, ['api', 'http', 'smtp']);
+        throw new UnsupportedSchemeException($dsn, ['api', 'http', 'smtp', 'smtps']);
     }
 
     public function supports(Dsn $dsn): bool
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkTransportFactoryTest.php
@@ -37,6 +37,11 @@ public function supportsProvider(): iterable
             true,
         ];
 
+        yield [
+            new Dsn('smtps', 'postmark'),
+            true,
+        ];
+
         yield [
             new Dsn('smtp', 'example.com'),
             false,
@@ -57,13 +62,18 @@ public function createProvider(): iterable
             new Dsn('smtp', 'postmark', self::USER),
             new PostmarkSmtpTransport(self::USER, $dispatcher, $logger),
         ];
+
+        yield [
+            new Dsn('smtps', 'postmark', self::USER),
+            new PostmarkSmtpTransport(self::USER, $dispatcher, $logger),
+        ];
     }
 
     public function unsupportedSchemeProvider(): iterable
     {
         yield [
             new Dsn('foo', 'postmark', self::USER),
-            'The "foo" scheme is not supported for mailer "postmark". Supported schemes are: "api", "smtp".',
+            'The "foo" scheme is not supported for mailer "postmark". Supported schemes are: "api", "smtp", "smtps".',
         ];
     }
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkSmtpTransport.php
@@ -22,7 +22,7 @@ class PostmarkSmtpTransport extends EsmtpTransport
 {
     public function __construct(string $id, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
-        parent::__construct('smtp.postmarkapp.com', 587, 'tls', null, $dispatcher, $logger);
+        parent::__construct('smtp.postmarkapp.com', 587, true, null, $dispatcher, $logger);
 
         $this->setUsername($id);
         $this->setPassword($id);
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkTransportFactory.php
@@ -30,11 +30,11 @@ public function create(Dsn $dsn): TransportInterface
             return new PostmarkApiTransport($user, $this->client, $this->dispatcher, $this->logger);
         }
 
-        if ('smtp' === $scheme) {
+        if ('smtp' === $scheme || 'smtps' === $scheme) {
             return new PostmarkSmtpTransport($user, $this->dispatcher, $this->logger);
         }
 
-        throw new UnsupportedSchemeException($dsn, ['api', 'smtp']);
+        throw new UnsupportedSchemeException($dsn, ['api', 'smtp', 'smtps']);
     }
 
     public function supports(Dsn $dsn): bool
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Transport/SendgridTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Transport/SendgridTransportFactoryTest.php
@@ -37,6 +37,11 @@ public function supportsProvider(): iterable
             true,
         ];
 
+        yield [
+            new Dsn('smtps', 'sendgrid'),
+            true,
+        ];
+
         yield [
             new Dsn('smtp', 'example.com'),
             false,
@@ -57,13 +62,18 @@ public function createProvider(): iterable
             new Dsn('smtp', 'sendgrid', self::USER),
             new SendgridSmtpTransport(self::USER, $dispatcher, $logger),
         ];
+
+        yield [
+            new Dsn('smtps', 'sendgrid', self::USER),
+            new SendgridSmtpTransport(self::USER, $dispatcher, $logger),
+        ];
     }
 
     public function unsupportedSchemeProvider(): iterable
     {
         yield [
             new Dsn('foo', 'sendgrid', self::USER),
-            'The "foo" scheme is not supported for mailer "sendgrid". Supported schemes are: "api", "smtp".',
+            'The "foo" scheme is not supported for mailer "sendgrid". Supported schemes are: "api", "smtp", "smtps".',
         ];
     }
 }
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridSmtpTransport.php
@@ -22,7 +22,7 @@ class SendgridSmtpTransport extends EsmtpTransport
 {
     public function __construct(string $key, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
-        parent::__construct('smtp.sendgrid.net', 465, 'ssl', null, $dispatcher, $logger);
+        parent::__construct('smtp.sendgrid.net', 465, true, null, $dispatcher, $logger);
 
         $this->setUsername('apikey');
         $this->setPassword($key);
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridTransportFactory.php
@@ -29,11 +29,11 @@ public function create(Dsn $dsn): TransportInterface
             return new SendgridApiTransport($key, $this->client, $this->dispatcher, $this->logger);
         }
 
-        if ('smtp' === $dsn->getScheme()) {
+        if ('smtp' === $dsn->getScheme() || 'smtps' === $dsn->getScheme()) {
             return new SendgridSmtpTransport($key, $this->dispatcher, $this->logger);
         }
 
-        throw new UnsupportedSchemeException($dsn, ['api', 'smtp']);
+        throw new UnsupportedSchemeException($dsn, ['api', 'smtp', 'smtps']);
     }
 
     public function supports(Dsn $dsn): bool
diff --git a/src/Symfony/Component/Mailer/CHANGELOG.md b/src/Symfony/Component/Mailer/CHANGELOG.md
@@ -4,6 +4,9 @@ CHANGELOG
 4.4.0
 -----
 
+ * STARTTLS cannot be enabled anymore (it is used automatically if TLS is disabled and the server supports STARTTLS)
+ * [BC BREAK] Removed the `encryption` DSN option (use `smtps` instead)
+ * Added support for the `smtps` protocol (does the same as using `smtp` and port `465`)
  * Added PHPUnit constraints
  * Added `MessageDataCollector`
  * Added `MessageEvents` and `MessageLoggerListener` to allow collecting sent emails
diff --git a/src/Symfony/Component/Mailer/Test/TransportFactoryTestCase.php b/src/Symfony/Component/Mailer/Test/TransportFactoryTestCase.php
@@ -69,7 +69,7 @@ public function testCreate(Dsn $dsn, TransportInterface $transport): void
         $factory = $this->getFactory();
 
         $this->assertEquals($transport, $factory->create($dsn));
-        if ('smtp' !== $dsn->getScheme()) {
+        if ('smtp' !== $dsn->getScheme() && 'smtps' !== $dsn->getScheme()) {
             $this->assertStringMatchesFormat($dsn->getScheme().'://%S'.$dsn->getHost().'%S', $transport->getName());
         }
     }
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportFactoryTest.php b/src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportFactoryTest.php
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportTest.php b/src/Symfony/Component/Mailer/Tests/Transport/Smtp/EsmtpTransportTest.php
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/Smtp/SmtpTransportTest.php b/src/Symfony/Component/Mailer/Tests/Transport/Smtp/SmtpTransportTest.php
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/Smtp/Stream/SocketStreamTest.php b/src/Symfony/Component/Mailer/Tests/Transport/Smtp/Stream/SocketStreamTest.php
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php b/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransport.php
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransportFactory.php b/src/Symfony/Component/Mailer/Transport/Smtp/EsmtpTransportFactory.php
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php b/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/Stream/SocketStream.php b/src/Symfony/Component/Mailer/Transport/Smtp/Stream/SocketStream.php

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class SesSmtpTransport extends EsmtpTransport`
`25`	`25`	`*/`
`26`	`26`	`public function __construct(string $username, string $password, string $region = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)`
`27`	`27`	`{`
`28`		`- parent::__construct(sprintf('email-smtp.%s.amazonaws.com', $region ?: 'eu-west-1'), 587, 'tls', null, $dispatcher, $logger);`
	`28`	`+ parent::__construct(sprintf('email-smtp.%s.amazonaws.com', $region ?: 'eu-west-1'), 587, true, null, $dispatcher, $logger);`
`29`	`29`
`30`	`30`	`$this->setUsername($username);`
`31`	`31`	`$this->setPassword($password);`
Original file line number	Diff line number	Diff line change
`@@ -36,11 +36,11 @@ public function create(Dsn $dsn): TransportInterface`
`36`	`36`	`return new SesHttpTransport($user, $password, $region, $this->client, $this->dispatcher, $this->logger);`
`37`	`37`	`}`
`38`	`38`
`39`		`- if ('smtp' === $scheme) {`
	`39`	`+ if ('smtp' === $scheme \|\| 'smtps' === $scheme) {`
`40`	`40`	`return new SesSmtpTransport($user, $password, $region, $this->dispatcher, $this->logger);`
`41`	`41`	`}`
`42`	`42`
`43`		`- throw new UnsupportedSchemeException($dsn, ['api', 'http', 'smtp']);`
	`43`	`+ throw new UnsupportedSchemeException($dsn, ['api', 'http', 'smtp', 'smtps']);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public function supports(Dsn $dsn): bool`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class GmailSmtpTransport extends EsmtpTransport`
`22`	`22`	`{`
`23`	`23`	`public function __construct(string $username, string $password, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)`
`24`	`24`	`{`
`25`		`- parent::__construct('smtp.gmail.com', 465, 'ssl', null, $dispatcher, $logger);`
	`25`	`+ parent::__construct('smtp.gmail.com', 465, true, null, $dispatcher, $logger);`
`26`	`26`
`27`	`27`	`$this->setUsername($username);`
`28`	`28`	`$this->setPassword($password);`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,11 @@ final class GmailTransportFactory extends AbstractTransportFactory`
`23`	`23`	`{`
`24`	`24`	`public function create(Dsn $dsn): TransportInterface`
`25`	`25`	`{`
`26`		`- if ('smtp' === $dsn->getScheme()) {`
	`26`	`+ if ('smtp' === $dsn->getScheme() \|\| 'smtps' === $dsn->getScheme()) {`
`27`	`27`	`return new GmailSmtpTransport($this->getUser($dsn), $this->getPassword($dsn), $this->dispatcher, $this->logger);`
`28`	`28`	`}`
`29`	`29`
`30`		`- throw new UnsupportedSchemeException($dsn, ['smtp']);`
	`30`	`+ throw new UnsupportedSchemeException($dsn, ['smtp', 'smtps']);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public function supports(Dsn $dsn): bool`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class MandrillSmtpTransport extends EsmtpTransport`
`22`	`22`	`{`
`23`	`23`	`public function __construct(string $username, string $password, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)`
`24`	`24`	`{`
`25`		`- parent::__construct('smtp.mandrillapp.com', 587, 'tls', null, $dispatcher, $logger);`
	`25`	`+ parent::__construct('smtp.mandrillapp.com', 587, true, null, $dispatcher, $logger);`
`26`	`26`
`27`	`27`	`$this->setUsername($username);`
`28`	`28`	`$this->setPassword($password);`
Original file line number	Diff line number	Diff line change
`@@ -34,13 +34,13 @@ public function create(Dsn $dsn): TransportInterface`
`34`	`34`	`return new MandrillHttpTransport($user, $this->client, $this->dispatcher, $this->logger);`
`35`	`35`	`}`
`36`	`36`
`37`		`- if ('smtp' === $scheme) {`
	`37`	`+ if ('smtp' === $scheme \|\| 'smtps' === $scheme) {`
`38`	`38`	`$password = $this->getPassword($dsn);`
`39`	`39`
`40`	`40`	`return new MandrillSmtpTransport($user, $password, $this->dispatcher, $this->logger);`
`41`	`41`	`}`
`42`	`42`
`43`		`- throw new UnsupportedSchemeException($dsn, ['api', 'http', 'smtp']);`
	`43`	`+ throw new UnsupportedSchemeException($dsn, ['api', 'http', 'smtp', 'smtps']);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public function supports(Dsn $dsn): bool`