Merge 3195118 into dc11578

src/Messenger/DI/MessengerExtension.php

@@ -182,7 +182,8 @@ private function processBuses() : void
                 ->setFactory(HandleMessageMiddleware::class, [$handlersLocator, $busConfig->allowNoHandlers]);
 
             $builder->addDefinition($this->prefix($busName . '.bus'))
-                ->setFactory(MessageBus::class, [$middleware]);
+                ->setFactory(MessageBus::class, [$middleware])
+                ->setTags([self::TAG_BUS_NAME => $busName]);
         }
     }
 

src/Messenger/Transport/TaggedServiceLocator.php

@@ -30,6 +30,7 @@ public function __construct(string $tagName, Container $container, ?string $defa
     }
 
     /**
+     * @param string $id
      * @return object
      */
     public function get($id)

tests/DI/MessengerExtensionTest.php

@@ -21,6 +21,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
+use Symfony\Component\Messenger\RoutableMessageBus;
 use Symfony\Component\Messenger\Stamp\HandledStamp;
 use Symfony\Component\Messenger\Stamp\SentStamp;
 use function array_map;
@@ -217,6 +218,18 @@ public function testCustomDefaultSerializerIsPassedToSenderWhen() : void
         );
     }
 
+    public function testBusLocatorReturnsCorrectBuses() : void
+    {
+        $container = $this->getContainer(__DIR__ . '/busLocator.neon');
+
+        $busLocator = $container->getService('messenger.busLocator');
+        assert($busLocator instanceof RoutableMessageBus);
+
+        foreach (['a', 'b', 'c'] as $busName) {
+            $this->assertSame($container->getService('messenger.' . $busName . '.bus'), $busLocator->getMessageBus($busName));
+        }
+    }
+
     /**
      * @param string[] $expectedResults
      */

tests/DI/busLocator.neon

@@ -0,0 +1,10 @@
+messenger:
+    buses:
+        a:
+        b:
+        c:
+
+services:
+    - Fixtures\CustomTransport
+    - class: Fixtures\CustomTransportFactory
+      tags: [messenger.transportFactory]