Skip to content

Commit bfc56c7

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: [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 0621748 + 2ec7aea commit bfc56c7

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
@@ -2430,11 +2430,11 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
24302430
MailgunTransportFactory::class => 'mailer.transport_factory.mailgun',
24312431
MailjetTransportFactory::class => 'mailer.transport_factory.mailjet',
24322432
MandrillTransportFactory::class => 'mailer.transport_factory.mailchimp',
2433+
OhMySmtpTransportFactory::class => 'mailer.transport_factory.ohmysmtp',
24332434
PostmarkTransportFactory::class => 'mailer.transport_factory.postmark',
24342435
SendgridTransportFactory::class => 'mailer.transport_factory.sendgrid',
24352436
SendinblueTransportFactory::class => 'mailer.transport_factory.sendinblue',
24362437
SesTransportFactory::class => 'mailer.transport_factory.amazon',
2437-
OhMySmtpTransportFactory::class => 'mailer.transport_factory.ohmysmtp',
24382438
];
24392439

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

0 commit comments

Comments
 (0)