Revert "[Messenger] Removing "sync" transport and replacing it with much nicer config trick"

This reverts commit 3d4e59a10b0b0e8e47ac48b6a6dd2b79484b0843.

Author: weaverryan

DependencyInjection/FrameworkExtension.php

@@ -1775,27 +1775,18 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             $container->setAlias('messenger.default_serializer', $config['serializer']['default_serializer']);
         }
 
-        $senderReferences = [];
-        $syncTransports = [];
+        $senderAliases = [];
         $transportRetryReferences = [];
         foreach ($config['transports'] as $name => $transport) {
             $serializerId = $transport['serializer'] ?? 'messenger.default_serializer';
 
-            if (0 === strpos($transport['dsn'], 'sync://')) {
-                $syncTransports[] = $name;
-            } else {
-                $transportDefinition = (new Definition(TransportInterface::class))
-                    ->setFactory([new Reference('messenger.transport_factory'), 'createTransport'])
-                    ->setArguments([$transport['dsn'], $transport['options'] + ['transport_name' => $name], new Reference($serializerId)])
-                    ->addTag('messenger.receiver', ['alias' => $name])
-                ;
-                $container->setDefinition($transportId = 'messenger.transport.'.$name, $transportDefinition);
-
-                // alias => service_id
-                $senderReferences[$name] = new Reference($transportId);
-                // service_id => service_id
-                $senderReferences[$transportId] = new Reference($transportId);
-            }
+            $transportDefinition = (new Definition(TransportInterface::class))
+                ->setFactory([new Reference('messenger.transport_factory'), 'createTransport'])
+                ->setArguments([$transport['dsn'], $transport['options'] + ['transport_name' => $name], new Reference($serializerId)])
+                ->addTag('messenger.receiver', ['alias' => $name])
+            ;
+            $container->setDefinition($transportId = 'messenger.transport.'.$name, $transportDefinition);
+            $senderAliases[$name] = $transportId;
 
             if (null !== $transport['retry_strategy']['service']) {
                 $transportRetryReferences[$name] = new Reference($transport['retry_strategy']['service']);
@@ -1813,25 +1804,30 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             }
         }
 
+        $senderReferences = [];
+        // alias => service_id
+        foreach ($senderAliases as $alias => $serviceId) {
+            $senderReferences[$alias] = new Reference($serviceId);
+        }
+        // service_id => service_id
+        foreach ($senderAliases as $serviceId) {
+            $senderReferences[$serviceId] = new Reference($serviceId);
+        }
+
         $messageToSendersMapping = [];
         foreach ($config['routing'] as $message => $messageConfiguration) {
             if ('*' !== $message && !class_exists($message) && !interface_exists($message, false)) {
                 throw new LogicException(sprintf('Invalid Messenger routing configuration: class or interface "%s" not found.', $message));
             }
 
-            // filter out "sync" senders
-            $realSenders = [];
+            // make sure senderAliases contains all senders
             foreach ($messageConfiguration['senders'] as $sender) {
-                if (isset($senderReferences[$sender])) {
-                    $realSenders[] = $sender;
-                } elseif (!\in_array($sender, $syncTransports, true)) {
+                if (!isset($senderReferences[$sender])) {
                     throw new LogicException(sprintf('Invalid Messenger routing configuration: the "%s" class is being routed to a sender called "%s". This is not a valid transport or service id.', $message, $sender));
                 }
             }
 
-            if ($realSenders) {
-                $messageToSendersMapping[$message] = $realSenders;
-            }
+            $messageToSendersMapping[$message] = $messageConfiguration['senders'];
         }
 
         $container->getDefinition('messenger.senders_locator')

Resources/config/messenger.xml

@@ -75,6 +75,11 @@
             <tag name="messenger.transport_factory" />
         </service>
 
+        <service id="messenger.transport.sync.factory" class="Symfony\Component\Messenger\Transport\Sync\SyncTransportFactory">
+            <tag name="messenger.transport_factory" />
+            <argument type="service" id="messenger.routable_message_bus" />
+        </service>
+
         <service id="messenger.transport.in_memory.factory" class="Symfony\Component\Messenger\Transport\InMemoryTransportFactory">
             <tag name="messenger.transport_factory" />
             <tag name="kernel.reset" method="reset" />

Tests/DependencyInjection/Fixtures/php/messenger_sync_transport.php

@@ -16,8 +16,6 @@
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAnnotationsCachedReaderPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension;
 use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage;
-use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage;
-use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\SecondMessage;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Bundle\FullStack;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
@@ -784,17 +782,6 @@ public function testMessengerInvalidTransportRouting()
         $this->createContainerFromFile('messenger_routing_invalid_transport');
     }
 
-    public function testMessengerSyncTransport()
-    {
-        $container = $this->createContainerFromFile('messenger_sync_transport');
-        $senderLocatorDefinition = $container->getDefinition('messenger.senders_locator');
-
-        $sendersMapping = $senderLocatorDefinition->getArgument(0);
-        $this->assertEquals(['amqp'], $sendersMapping[DummyMessage::class]);
-        $this->assertArrayNotHasKey(SecondMessage::class, $sendersMapping);
-        $this->assertEquals(['amqp'], $sendersMapping[FooMessage::class]);
-    }
-
     public function testTranslator()
     {
         $container = $this->createContainerFromFile('full');