Commitc15ba90

committed

check throw exception if default bus missing and rewrite error message

1 parent8735909 commitc15ba90Copy full SHA for c15ba90

File tree

+20

-8

lines changed

+20

-8

lines changed

Lines changed: 4 additions & 7 deletions

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`		`-thrownewInvalidArgumentException(sprintf('Invalid busname "%s"on BusNameStamp.',$busNameStampName));`
	`50`	`+if (!$this->busLocator->has($busName)) {`
	`51`	`+thrownewInvalidArgumentException(sprintf('Busname "%s"does not exists.',$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`	`}`

Lines changed: 16 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -60,10 +60,25 @@ public function testItRoutesToDefaultBus()`
`60`	`60`	`$this->assertSame($envelope,$routableBus->dispatch($envelope, [$stamp]));`
`61`	`61`	`}`
`62`	`62`
	`63`	`+publicfunctiontestItExceptionOnDefaultBusNotFound()`
	`64`	`+ {`
	`65`	`+$this->expectException(InvalidArgumentException::class);`
	`66`	`+$this->expectExceptionMessage(sprintf('Bus name "%s" does not exists.', MessageBusInterface::class));`
	`67`	`+`
	`68`	`+$envelope =newEnvelope(new \stdClass());`
	`69`	`+`
	`70`	`+$container =$this->createMock(ContainerInterface::class);`
	`71`	`+$container->expects($this->once())->method('has')->with(MessageBusInterface::class)`
	`72`	`+ ->willReturn(false);`
	`73`	`+`
	`74`	`+$routableBus =newRoutableMessageBus($container);`
	`75`	`+$routableBus->dispatch($envelope);`
	`76`	`+ }`
	`77`	`+`
`63`	`78`	`publicfunctiontestItExceptionOnBusNotFound()`
`64`	`79`	`{`
`65`	`80`	`$this->expectException(InvalidArgumentException::class);`
`66`		`-$this->expectExceptionMessage('Invalid busname');`
	`81`	`+$this->expectExceptionMessage(sprintf('Busname "%s" does not exists.','foo_bus'));`
`67`	`82`
`68`	`83`	`$envelope =newEnvelope(new \stdClass(), [newBusNameStamp('foo_bus')]);`
`69`	`84`

Comments

(0)