Commit8fde9b3

committed

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

1 parent27d10a6 commit8fde9b3Copy full SHA for 8fde9b3

File tree

+17

-11

lines changed

+17

-11

lines changed

Lines changed: 6 additions & 5 deletions

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`		`-thrownewInvalidArgumentException('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`		`-thrownewInvalidArgumentException(sprintf('Invalid bus name "%s" on BusNameStamp.',$busNameStamp->getBusName()));`
	`53`	`+if (!$this->busLocator->has($busNameStampName)) {`
	`54`	`+thrownewInvalidArgumentException(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`	`}`

Lines changed: 11 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,18 +41,23 @@ public function testItRoutesToTheCorrectBus()`
`41`	`41`	`$this->assertSame($envelope,$routableBus->dispatch($envelope, [$stamp]));`
`42`	`42`	`}`
`43`	`43`
`44`		`-publicfunctiontestItExceptionOnMissingStamp()`
	`44`	`+publicfunctiontestItRoutesToDefaultBus()`
`45`	`45`	`{`
`46`		`-$this->expectException(InvalidArgumentException::class);`
`47`		`-$this->expectExceptionMessage('does not contain a BusNameStamp');`
`48`		`-`
`49`	`46`	`$envelope =newEnvelope(new \stdClass());`
	`47`	`+$stamp =newDelayStamp(5);`
	`48`	`+$defaultBus =$this->createMock(MessageBusInterface::class);`
	`49`	`+$defaultBus->expects($this->once())->method('dispatch')->with($envelope, [$stamp])`
	`50`	`+ ->willReturn($envelope);`
`50`	`51`
`51`	`52`	`$container =$this->createMock(ContainerInterface::class);`
`52`		`-$container->expects($this->never())->method('has');`
	`53`	`+$container->expects($this->once())->method('has')->with(MessageBusInterface::class)`
	`54`	`+ ->willReturn(true);`
	`55`	`+$container->expects($this->once())->method('get')->with(MessageBusInterface::class)`
	`56`	`+ ->willReturn($defaultBus);`
`53`	`57`
`54`	`58`	`$routableBus =newRoutableMessageBus($container);`
`55`		`-$routableBus->dispatch($envelope);`
	`59`	`+`
	`60`	`+$this->assertSame($envelope,$routableBus->dispatch($envelope, [$stamp]));`
`56`	`61`	`}`
`57`	`62`
`58`	`63`	`publicfunctiontestItExceptionOnBusNotFound()`

Comments

(0)