Skip to content

Commit 3fe1681

Browse files
Merge branch '7.2' into 7.3
* 7.2: [Yaml] fix support for years outside of the 32b range on x86 arch on PHP 8.4 use STARTTLS for SMTP with MailerSend
2 parents b2a1379 + 0ac0327 commit 3fe1681

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/Symfony/Component/Mailer/Bridge/MailerSend/Transport/MailerSendSmtpTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ final class MailerSendSmtpTransport extends EsmtpTransport
2222
{
2323
public function __construct(string $username, #[\SensitiveParameter] string $password, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null)
2424
{
25-
parent::__construct('smtp.mailersend.net', 587, true, $dispatcher, $logger);
25+
parent::__construct('smtp.mailersend.net', 587, false, $dispatcher, $logger);
2626

2727
$this->setUsername($username);
2828
$this->setPassword($password);

src/Symfony/Component/Yaml/Inline.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ private static function evaluateScalar(string $scalar, int $flags, array &$refer
750750
if (false !== $scalar = $time->getTimestamp()) {
751751
return $scalar;
752752
}
753-
} catch (\ValueError) {
753+
} catch (\DateRangeError|\ValueError) {
754754
// no-op
755755
}
756756

0 commit comments

Comments
 (0)