Skip to content

Commit 89b94f8

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Console] Prevent PHP 8.1 str_replace deprec on null Improve DE translations for Form/Validator [Serializer] Fix ignore attribute in Xml files [Console] Escape % in command name & description from getDefault*() [WebProfilerBundle] Fix dark theme selected line highlight color & reuse css vars [Mime] Check that the path is a file in the DataPart::fromPath [Cache] do not pass null to strlen() [Mailer] Sort transports alphabetically [Security] Fix some phpdoc [Serializer] Get attributeContext after converting name
2 parents 706af6b + f3bc898 commit 89b94f8

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Exception/UnsupportedSchemeException.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ class UnsupportedSchemeException extends LogicException
3636
'class' => Bridge\Mailchimp\Transport\MandrillTransportFactory::class,
3737
'package' => 'symfony/mailchimp-mailer',
3838
],
39+
'ohmysmtp' => [
40+
'class' => Bridge\OhMySmtp\Transport\OhMySmtpTransportFactory::class,
41+
'package' => 'symfony/oh-my-smtp-mailer',
42+
],
3943
'postmark' => [
4044
'class' => Bridge\Postmark\Transport\PostmarkTransportFactory::class,
4145
'package' => 'symfony/postmark-mailer',
@@ -52,10 +56,6 @@ class UnsupportedSchemeException extends LogicException
5256
'class' => Bridge\Amazon\Transport\SesTransportFactory::class,
5357
'package' => 'symfony/amazon-mailer',
5458
],
55-
'ohmysmtp' => [
56-
'class' => Bridge\OhMySmtp\Transport\OhMySmtpTransportFactory::class,
57-
'package' => 'symfony/oh-my-smtp-mailer',
58-
],
5959
];
6060

6161
public function __construct(Dsn $dsn, string $name = null, array $supported = [])

Tests/Exception/UnsupportedSchemeExceptionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ public static function setUpBeforeClass(): void
3838
MailgunTransportFactory::class => false,
3939
MailjetTransportFactory::class => false,
4040
MandrillTransportFactory::class => false,
41+
OhMySmtpTransportFactory::class => false,
4142
PostmarkTransportFactory::class => false,
4243
SendgridTransportFactory::class => false,
4344
SendinblueTransportFactory::class => false,
44-
OhMySmtpTransportFactory::class => false,
4545
SesTransportFactory::class => false,
4646
]);
4747
}
@@ -65,10 +65,10 @@ public function messageWhereSchemeIsPartOfSchemeToPackageMapProvider(): \Generat
6565
yield ['mailgun', 'symfony/mailgun-mailer'];
6666
yield ['mailjet', 'symfony/mailjet-mailer'];
6767
yield ['mandrill', 'symfony/mailchimp-mailer'];
68+
yield ['ohmysmtp', 'symfony/oh-my-smtp-mailer'];
6869
yield ['postmark', 'symfony/postmark-mailer'];
6970
yield ['sendgrid', 'symfony/sendgrid-mailer'];
7071
yield ['sendinblue', 'symfony/sendinblue-mailer'];
71-
yield ['ohmysmtp', 'symfony/oh-my-smtp-mailer'];
7272
yield ['ses', 'symfony/amazon-mailer'];
7373
}
7474

Transport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ final class Transport
4747
MailgunTransportFactory::class,
4848
MailjetTransportFactory::class,
4949
MandrillTransportFactory::class,
50+
OhMySmtpTransportFactory::class,
5051
PostmarkTransportFactory::class,
5152
SendgridTransportFactory::class,
5253
SendinblueTransportFactory::class,
53-
OhMySmtpTransportFactory::class,
5454
SesTransportFactory::class,
5555
];
5656

0 commit comments

Comments
 (0)