Uses a service locator for the message senders as well

Author: sroze

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -42,7 +42,6 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ContainerBagInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
@@ -1390,18 +1389,20 @@ private function registerMessageConfiguration(array $config, ContainerBuilder $c
     {
         $loader->load('message.xml');
 
-        $messageToSenderMapping = array();
+        $senderLocatorMapping = array();
+        $messageToSenderIdsMapping = array();
         foreach ($config['routing'] as $message => $messageConfiguration) {
-            $messageToSenderMapping[$message] = array_map(function (?string $service) {
-                if (is_string($service)) {
-                    return new Reference($service);
+            foreach ($messageConfiguration['senders'] as $sender) {
+                if (null !== $sender) {
+                    $senderLocatorMapping[$sender] = new Reference($sender);
                 }
+            }
 
-                return $service;
-            }, $messageConfiguration['senders']);
+            $messageToSenderIdsMapping[$message] = $messageConfiguration['senders'];
         }
 
-        $container->getDefinition('message.asynchronous.routing.sender_locator')->setArgument(0, $messageToSenderMapping);
+        $container->getDefinition('message.sender_locator')->replaceArgument(0, $senderLocatorMapping);
+        $container->getDefinition('message.asynchronous.routing.sender_locator')->replaceArgument(1, $messageToSenderIdsMapping);
     }
 
     private function registerCacheConfiguration(array $config, ContainerBuilder $container)

src/Symfony/Bundle/FrameworkBundle/Resources/config/message.xml

@@ -27,7 +27,8 @@
 
         <!-- Asynchronous -->
         <service id="message.asynchronous.routing.sender_locator" class="Symfony\Component\Message\Asynchronous\Routing\SenderLocator">
-            <argument type="collection" /> <!-- Message to sender mapping -->
+            <argument type="service" id="message.sender_locator" />
+            <argument /> <!-- Message to sender ID mapping -->
         </service>
         <service id="message.asynchronous.middleware.send_message_to_producer" class="Symfony\Component\Message\Asynchronous\Middleware\SendMessageMiddleware">
             <argument type="service" id="message.asynchronous.routing.sender_locator" />
@@ -61,5 +62,9 @@
             <tag name="container.service_locator" />
             <argument type="collection" />
         </service>
+        <service id="message.sender_locator">
+            <tag name="container.service_locator" />
+            <argument type="collection" />
+        </service>
     </services>
 </container>

src/Symfony/Component/Message/Asynchronous/Routing/SenderLocator.php

@@ -11,26 +11,34 @@
 
 namespace Symfony\Component\Message\Asynchronous\Routing;
 
+use Psr\Container\ContainerInterface;
+
 /**
  * @author Samuel Roze <samuel.roze@gmail.com>
  */
 class SenderLocator implements SenderLocatorInterface
 {
-    /**
-     * Mapping describing which sender should be used for which message.
-     */
-    private $messageToSenderMapping;
+    private $senderServiceLocator;
+    private $messageToSenderIdsMapping;
 
-    public function __construct(array $messageToSenderMapping)
+    public function __construct(ContainerInterface $senderServiceLocator, array $messageToSenderIdsMapping)
     {
-        $this->messageToSenderMapping = $messageToSenderMapping;
+        $this->senderServiceLocator = $senderServiceLocator;
+        $this->messageToSenderIdsMapping = $messageToSenderIdsMapping;
     }
 
     /**
      * {@inheritdoc}
      */
     public function getSendersForMessage($message): array
     {
-        return $this->messageToSenderMapping[get_class($message)] ?? $this->messageToSenderMapping['*'] ?? array();
+        $senderIds = $this->messageToSenderIdsMapping[get_class($message)] ?? $this->messageToSenderIdsMapping['*'] ?? array();
+
+        $senders = array();
+        foreach ($senderIds as $senderId) {
+            $senders[] = $this->senderServiceLocator->get($senderId);
+        }
+
+        return $senders;
     }
 }

src/Symfony/Component/Message/DependencyInjection/MessagePass.php

@@ -117,7 +117,7 @@ private function guessHandledClass(ContainerBuilder $container, string $serviceI
 
     private function registerReceivers(ContainerBuilder $container)
     {
-        $receiverMapping = [];
+        $receiverMapping = array();
         foreach ($container->findTaggedServiceIds('message.receiver') as $id => $tags) {
             foreach ($tags as $tag) {
                 $receiverMapping[$tag['id'] ?? $id] = new Reference($id);