check throw exception if default bus missing and rewrite error message

dirk39 · leadspark · commit 6ed20d8b65bf · 2019-04-29T11:58:49.000+02:00
diff --git a/src/Symfony/Component/Messenger/RoutableMessageBus.php b/src/Symfony/Component/Messenger/RoutableMessageBus.php
@@ -45,15 +45,12 @@ public function dispatch($envelope, array $stamps = []): Envelope
 
         /** @var BusNameStamp $busNameStamp */
         $busNameStamp = $envelope->last(BusNameStamp::class);
-        $busNameStampName = MessageBusInterface::class;
-        if (null !== $busNameStamp) {
-            $busNameStampName = $busNameStamp->getBusName();
-        }
+        $busName = null !== $busNameStamp ? $busNameStamp->getBusName() : MessageBusInterface::class;
 
-        if (!$this->busLocator->has($busNameStampName)) {
-            throw new InvalidArgumentException(sprintf('Invalid bus name "%s" on BusNameStamp.', $busNameStampName));
+        if (!$this->busLocator->has($busName)) {
+            throw new InvalidArgumentException(sprintf('Bus named "%s" does not exist.', $busName));
         }
 
-        return $this->busLocator->get($busNameStampName)->dispatch($envelope, $stamps);
+        return $this->busLocator->get($busName)->dispatch($envelope, $stamps);
     }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/RoutableMessageBusTest.php b/src/Symfony/Component/Messenger/Tests/RoutableMessageBusTest.php
@@ -14,7 +14,6 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\Exception\InvalidArgumentException;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\RoutableMessageBus;
 use Symfony\Component\Messenger\Stamp\BusNameStamp;
@@ -60,11 +59,28 @@ public function testItRoutesToDefaultBus()
         $this->assertSame($envelope, $routableBus->dispatch($envelope, [$stamp]));
     }
 
-    public function testItExceptionOnBusNotFound()
+    /**
+     * @expectedException \Symfony\Component\Messenger\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Bus named "Symfony\Component\Messenger\MessageBusInterface" does not exist.
+     */
+    public function testItExceptionOnDefaultBusNotFound()
     {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Invalid bus name');
+        $envelope = new Envelope(new \stdClass());
+
+        $container = $this->createMock(ContainerInterface::class);
+        $container->expects($this->once())->method('has')->with(MessageBusInterface::class)
+            ->willReturn(false);
 
+        $routableBus = new RoutableMessageBus($container);
+        $routableBus->dispatch($envelope);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Messenger\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Bus named "foo_bus" does not exist.
+     */
+    public function testItExceptionOnBusNotFound()
+    {
         $envelope = new Envelope(new \stdClass(), [new BusNameStamp('foo_bus')]);
 
         $container = $this->createMock(ContainerInterface::class);

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