bug #35518 [Mailer] Fix STARTTLS support for Postmark and Mandrill (fabpot)

fabpot · fabpot · commit 6b0103ec5aab · 2020-01-30T11:34:36.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [Mailer] Fix STARTTLS support for Postmark and Mandrill | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | Fix #34846  | License | MIT | Doc PR | n/a Commits ------- 44b27c6 [Mailer] Fix STARTTLS support for Postmark and Mandrill
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, true, $dispatcher, $logger);
+        parent::__construct('smtp.mandrillapp.com', 587, false, $dispatcher, $logger);
 
         $this->setUsername($username);
         $this->setPassword($password);
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkSmtpTransport.php
@@ -26,7 +26,7 @@ class PostmarkSmtpTransport extends EsmtpTransport
 {
     public function __construct(string $id, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
-        parent::__construct('smtp.postmarkapp.com', 587, true, $dispatcher, $logger);
+        parent::__construct('smtp.postmarkapp.com', 587, false, $dispatcher, $logger);
 
         $this->setUsername($id);
         $this->setPassword($id);

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, true, $dispatcher, $logger);`
	`25`	`+ parent::__construct('smtp.mandrillapp.com', 587, false, $dispatcher, $logger);`
`26`	`26`
`27`	`27`	`$this->setUsername($username);`
`28`	`28`	`$this->setPassword($password);`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class PostmarkSmtpTransport extends EsmtpTransport`
`26`	`26`	`{`
`27`	`27`	`public function __construct(string $id, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)`
`28`	`28`	`{`
`29`		`- parent::__construct('smtp.postmarkapp.com', 587, true, $dispatcher, $logger);`
	`29`	`+ parent::__construct('smtp.postmarkapp.com', 587, false, $dispatcher, $logger);`
`30`	`30`
`31`	`31`	`$this->setUsername($id);`
`32`	`32`	`$this->setPassword($id);`