Merge branch '5.4' into 6.0

* 5.4:
  Backport changes to prepare typed properties
  Cast ini_get to an integer to match expected type
  Add no-interaction for SYMFONY_PHPUNIT_REMOVE
  Add no-interaction for SYMFONY_PHPUNIT_REQUIRE on prophecy
  Fix deps
  [Mailer] Added OhMySMTP Bridge
  [Notifier] Add Esendex message ID to SentMessage object
  Remove indices in messenger table on MySQL to prevent deadlocks while removing messages when running multiple consumers
  autoconfigure chatter.transport_factory
  Handle ignoreExtraKeys in config builder

Author: derrabus

DependencyInjection/FrameworkExtension.php

@@ -90,6 +90,7 @@
 use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetTransportFactory;
+use Symfony\Component\Mailer\Bridge\OhMySmtp\Transport\OhMySmtpTransportFactory;
 use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
 use Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory;
 use Symfony\Component\Mailer\Bridge\Sendinblue\Transport\SendinblueTransportFactory;
@@ -151,6 +152,7 @@
 use Symfony\Component\Notifier\Bridge\Zulip\ZulipTransportFactory;
 use Symfony\Component\Notifier\Notifier;
 use Symfony\Component\Notifier\Recipient\Recipient;
+use Symfony\Component\Notifier\Transport\TransportFactoryInterface as NotifierTransportFactoryInterface;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 use Symfony\Component\PropertyInfo\PropertyAccessExtractorInterface;
 use Symfony\Component\PropertyInfo\PropertyDescriptionExtractorInterface;
@@ -2334,6 +2336,7 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
             SendgridTransportFactory::class => 'mailer.transport_factory.sendgrid',
             SendinblueTransportFactory::class => 'mailer.transport_factory.sendinblue',
             SesTransportFactory::class => 'mailer.transport_factory.amazon',
+            OhMySmtpTransportFactory::class => 'mailer.transport_factory.ohmysmtp',
         ];
 
         foreach ($classToServices as $class => $service) {
@@ -2406,6 +2409,12 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
 
         $container->getDefinition('notifier.channel_policy')->setArgument(0, $config['channel_policy']);
 
+        $container->registerForAutoconfiguration(NotifierTransportFactoryInterface::class)
+            ->addTag('chatter.transport_factory');
+
+        $container->registerForAutoconfiguration(NotifierTransportFactoryInterface::class)
+            ->addTag('texter.transport_factory');
+
         $classToServices = [
             AllMySmsTransportFactory::class => 'notifier.transport_factory.allmysms',
             AmazonSnsTransportFactory::class => 'notifier.transport_factory.amazonsns',

Resources/config/mailer_transports.php

@@ -16,6 +16,7 @@
 use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetTransportFactory;
+use Symfony\Component\Mailer\Bridge\OhMySmtp\Transport\OhMySmtpTransportFactory;
 use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
 use Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory;
 use Symfony\Component\Mailer\Bridge\Sendinblue\Transport\SendinblueTransportFactory;
@@ -76,6 +77,10 @@
         ->parent('mailer.transport_factory.abstract')
         ->tag('mailer.transport_factory')
 
+        ->set('mailer.transport_factory.ohmysmtp', OhMySmtpTransportFactory::class)
+            ->parent('mailer.transport_factory.abstract')
+            ->tag('mailer.transport_factory')
+
         ->set('mailer.transport_factory.smtp', EsmtpTransportFactory::class)
             ->parent('mailer.transport_factory.abstract')
             ->tag('mailer.transport_factory', ['priority' => -100])