Skip to content

Commit 2ec7aea

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 9fac94a + 00f5b4c commit 2ec7aea

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2330,11 +2330,11 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
23302330
MailgunTransportFactory::class => 'mailer.transport_factory.mailgun',
23312331
MailjetTransportFactory::class => 'mailer.transport_factory.mailjet',
23322332
MandrillTransportFactory::class => 'mailer.transport_factory.mailchimp',
2333+
OhMySmtpTransportFactory::class => 'mailer.transport_factory.ohmysmtp',
23332334
PostmarkTransportFactory::class => 'mailer.transport_factory.postmark',
23342335
SendgridTransportFactory::class => 'mailer.transport_factory.sendgrid',
23352336
SendinblueTransportFactory::class => 'mailer.transport_factory.sendinblue',
23362337
SesTransportFactory::class => 'mailer.transport_factory.amazon',
2337-
OhMySmtpTransportFactory::class => 'mailer.transport_factory.ohmysmtp',
23382338
];
23392339

23402340
foreach ($classToServices as $class => $service) {

0 commit comments

Comments
 (0)