From 7d69d4bfe1e3464851409a623cd06230c28e3183 Mon Sep 17 00:00:00 2001 From: Sander De la Marche Date: Wed, 22 Mar 2023 14:42:55 +0100 Subject: [PATCH 1/3] Pass the port from the Mailgun DSN to the MailgunSmtpTransport --- .../Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php | 4 ++-- .../Bridge/Mailgun/Transport/MailgunTransportFactory.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php index 84c4479d2defc..411302a2046f9 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php @@ -22,9 +22,9 @@ class MailgunSmtpTransport extends EsmtpTransport { use MailgunHeadersTrait; - public function __construct(string $username, #[\SensitiveParameter] string $password, string $region = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) + public function __construct(string $username, #[\SensitiveParameter] string $password, string $region = null, int $port = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) { - parent::__construct('us' !== ($region ?: 'us') ? sprintf('smtp.%s.mailgun.org', $region) : 'smtp.mailgun.org', 465, true, $dispatcher, $logger); + parent::__construct('us' !== ($region ?: 'us') ? sprintf('smtp.%s.mailgun.org', $region) : 'smtp.mailgun.org', $port ?? 465, true, $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 index c238f832fae89..297d942a54578 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunTransportFactory.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunTransportFactory.php @@ -39,7 +39,7 @@ public function create(Dsn $dsn): TransportInterface } if ('mailgun+smtp' === $scheme || 'mailgun+smtps' === $scheme) { - return new MailgunSmtpTransport($user, $password, $region, $this->dispatcher, $this->logger); + return new MailgunSmtpTransport($user, $password, $region, $port, $this->dispatcher, $this->logger); } throw new UnsupportedSchemeException($dsn, 'mailgun', $this->getSupportedSchemes()); From ff5469eba46f5c9021f2f33097cce8bbbb88b7c5 Mon Sep 17 00:00:00 2001 From: Sander De la Marche Date: Wed, 22 Mar 2023 15:14:03 +0100 Subject: [PATCH 2/3] Update method usage in tests --- .../Mailgun/Tests/Transport/MailgunTransportFactoryTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php index a88f1e153a8ff..e88be53d12c4a 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php @@ -98,12 +98,12 @@ public static function createProvider(): iterable yield [ new Dsn('mailgun+smtp', 'default', self::USER, self::PASSWORD), - new MailgunSmtpTransport(self::USER, self::PASSWORD, null, null, $logger), + new MailgunSmtpTransport(self::USER, self::PASSWORD, null, null,null, $logger), ]; yield [ new Dsn('mailgun+smtps', 'default', self::USER, self::PASSWORD), - new MailgunSmtpTransport(self::USER, self::PASSWORD, null, null, $logger), + new MailgunSmtpTransport(self::USER, self::PASSWORD, null, null,null, $logger), ]; } From 0eecc0c049b6d72d3edd592b4c2a98e00bbe3d81 Mon Sep 17 00:00:00 2001 From: Sander De la Marche Date: Wed, 22 Mar 2023 15:20:49 +0100 Subject: [PATCH 3/3] Add space to comply with code styles --- .../Mailgun/Tests/Transport/MailgunTransportFactoryTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php index e88be53d12c4a..abc47cf6e9d7b 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php @@ -98,12 +98,12 @@ public static function createProvider(): iterable yield [ new Dsn('mailgun+smtp', 'default', self::USER, self::PASSWORD), - new MailgunSmtpTransport(self::USER, self::PASSWORD, null, null,null, $logger), + new MailgunSmtpTransport(self::USER, self::PASSWORD, null, null, null, $logger), ]; yield [ new Dsn('mailgun+smtps', 'default', self::USER, self::PASSWORD), - new MailgunSmtpTransport(self::USER, self::PASSWORD, null, null,null, $logger), + new MailgunSmtpTransport(self::USER, self::PASSWORD, null, null, null, $logger), ]; }