symfony · fabpot · Oct 22, 2019 · Oct 22, 2019
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1774,18 +1774,27 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             $container->setAlias('messenger.default_serializer', $config['serializer']['default_serializer']);
         }
 
-        $senderAliases = [];
+        $senderReferences = [];
+        $syncTransports = [];
         $transportRetryReferences = [];
         foreach ($config['transports'] as $name => $transport) {
             $serializerId = $transport['serializer'] ?? 'messenger.default_serializer';
 
-            $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 (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);
+            }
 
             if (null !== $transport['retry_strategy']['service']) {
                 $transportRetryReferences[$name] = new Reference($transport['retry_strategy']['service']);
@@ -1803,30 +1812,25 @@ 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));
             }
 
-            // make sure senderAliases contains all senders
+            // filter out "sync" senders
+            $realSenders = [];
             foreach ($messageConfiguration['senders'] as $sender) {
-                if (!isset($senderReferences[$sender])) {
+                if (isset($senderReferences[$sender])) {
+                    $realSenders[] = $sender;
+                } elseif (!\in_array($sender, $syncTransports, true)) {
                     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));
                 }
             }
 
-            $messageToSendersMapping[$message] = $messageConfiguration['senders'];
+            if ($realSenders) {
+                $messageToSendersMapping[$message] = $realSenders;
+            }
         }
 
         $container->getDefinition('messenger.senders_locator')

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml
@@ -73,11 +73,6 @@
             <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" />

diff --git a/...undle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_sync_transport.php b/...undle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_sync_transport.php
@@ -0,0 +1,15 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'messenger' => [
+        'transports' => [
+            'amqp' => 'amqp://localhost/%2f/messages',
+            'sync' => 'sync://',
+        ],
+        'routing' => [
+            'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage' => ['amqp'],
+            'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\SecondMessage' => ['sync'],
+            'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage' => ['amqp', 'sync'],
+        ],
+    ],
+]);
diff --git a/...undle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_sync_transport.xml b/...undle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_sync_transport.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:messenger>
+            <framework:routing message-class="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage">
+                <framework:sender service="amqp" />
+            </framework:routing>
+            <framework:routing message-class="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\SecondMessage">
+                <framework:sender service="sync" />
+            </framework:routing>
+            <framework:routing message-class="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage">
+                <framework:sender service="amqp" />
+                <framework:sender service="sync" />
+            </framework:routing>
+            <framework:transport name="amqp" dsn="amqp://localhost/%2f/messages" />
+            <framework:transport name="sync" dsn="sync://" />
+        </framework:messenger>
+    </framework:config>
+</container>
diff --git a/...undle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_sync_transport.yml b/...undle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_sync_transport.yml
@@ -0,0 +1,10 @@
+framework:
+    messenger:
+        transports:
+            amqp: 'amqp://localhost/%2f/messages'
+            sync: 'sync://'
+
+        routing:
+            'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage': amqp
+            'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\SecondMessage': sync
+            'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage': [amqp, sync]
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -16,6 +16,8 @@
 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;
@@ -780,6 +782,17 @@ 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');

diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 4.4.0
 -----
 
+ * [BC BREAK] The `SyncTransport` and `SyncTransportFactory` classes were removed.
  * Deprecated passing a `ContainerInterface` instance as first argument of the `ConsumeMessagesCommand` constructor,
    pass a `RoutableMessageBus`  instance instead.
  * Added support for auto trimming of Redis streams.

diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Sync/SyncTransportFactoryTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Sync/SyncTransportFactoryTest.php
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Sync/SyncTransportTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Sync/SyncTransportTest.php
diff --git a/src/Symfony/Component/Messenger/Transport/Sync/SyncTransport.php b/src/Symfony/Component/Messenger/Transport/Sync/SyncTransport.php
diff --git a/src/Symfony/Component/Messenger/Transport/Sync/SyncTransportFactory.php b/src/Symfony/Component/Messenger/Transport/Sync/SyncTransportFactory.php