[Messenger] fallback to default bus if BusNameStamp missing from Envelope

dirk39 · dirk39 · commit a3e17df41654 · 2019-04-27T14:40:46.000+02:00
diff --git a/src/Symfony/Component/Messenger/RoutableMessageBus.php b/src/Symfony/Component/Messenger/RoutableMessageBus.php
@@ -45,14 +45,15 @@ public function dispatch($envelope, array $stamps = []): Envelope
 
         /** @var BusNameStamp $busNameStamp */
         $busNameStamp = $envelope->last(BusNameStamp::class);
-        if (null === $busNameStamp) {
-            throw new InvalidArgumentException('Envelope does not contain a BusNameStamp.');
+        $busNameStampName = MessageBusInterface::class;
+        if (null !== $busNameStamp) {
+            $busNameStampName = $busNameStamp->getBusName();
         }
 
-        if (!$this->busLocator->has($busNameStamp->getBusName())) {
-            throw new InvalidArgumentException(sprintf('Invalid bus name "%s" on BusNameStamp.', $busNameStamp->getBusName()));
+        if (!$this->busLocator->has($busNameStampName)) {
+            throw new InvalidArgumentException(sprintf('Invalid bus name "%s" on BusNameStamp.', $busNameStampName));
         }
 
-        return $this->busLocator->get($busNameStamp->getBusName())->dispatch($envelope, $stamps);
+        return $this->busLocator->get($busNameStampName)->dispatch($envelope, $stamps);
     }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/RoutableMessageBusTest.php b/src/Symfony/Component/Messenger/Tests/RoutableMessageBusTest.php
@@ -41,18 +41,25 @@ public function testItRoutesToTheCorrectBus()
         $this->assertSame($envelope, $routableBus->dispatch($envelope, [$stamp]));
     }
 
-    public function testItExceptionOnMissingStamp()
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('does not contain a BusNameStamp');
 
+
+    public function testItRoutesToDefaultBus()
+    {
         $envelope = new Envelope(new \stdClass());
+        $stamp = new DelayStamp(5);
+        $defaultBus = $this->createMock(MessageBusInterface::class);
+        $defaultBus->expects($this->once())->method('dispatch')->with($envelope, [$stamp])
+            ->willReturn($envelope);
 
         $container = $this->createMock(ContainerInterface::class);
-        $container->expects($this->never())->method('has');
+        $container->expects($this->once())->method('has')->with(MessageBusInterface::class)
+            ->willReturn(true);
+        $container->expects($this->once())->method('get')->with(MessageBusInterface::class)
+            ->willReturn($defaultBus);
 
         $routableBus = new RoutableMessageBus($container);
-        $routableBus->dispatch($envelope);
+
+        $this->assertSame($envelope, $routableBus->dispatch($envelope, [$stamp]));
     }
 
     public function testItExceptionOnBusNotFound()

Original file line number	Diff line number	Diff line change
`@@ -45,14 +45,15 @@ public function dispatch($envelope, array $stamps = []): Envelope`
`45`	`45`
`46`	`46`	`/** @var BusNameStamp $busNameStamp */`
`47`	`47`	`$busNameStamp = $envelope->last(BusNameStamp::class);`
`48`		`- if (null === $busNameStamp) {`
`49`		`- throw new InvalidArgumentException('Envelope does not contain a BusNameStamp.');`
	`48`	`+ $busNameStampName = MessageBusInterface::class;`
	`49`	`+ if (null !== $busNameStamp) {`
	`50`	`+ $busNameStampName = $busNameStamp->getBusName();`
`50`	`51`	`}`
`51`	`52`
`52`		`- if (!$this->busLocator->has($busNameStamp->getBusName())) {`
`53`		`- throw new InvalidArgumentException(sprintf('Invalid bus name "%s" on BusNameStamp.', $busNameStamp->getBusName()));`
	`53`	`+ if (!$this->busLocator->has($busNameStampName)) {`
	`54`	`+ throw new InvalidArgumentException(sprintf('Invalid bus name "%s" on BusNameStamp.', $busNameStampName));`
`54`	`55`	`}`
`55`	`56`
`56`		`- return $this->busLocator->get($busNameStamp->getBusName())->dispatch($envelope, $stamps);`
	`57`	`+ return $this->busLocator->get($busNameStampName)->dispatch($envelope, $stamps);`
`57`	`58`	`}`
`58`	`59`	`}`