Skip to content

[Messenger] Fix return senders based on the message parents/interfaces #27184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 10, 2018
Merged

[Messenger] Fix return senders based on the message parents/interfaces #27184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions src/Symfony/Component/Messenger/Asynchronous/Routing/SenderLocator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,29 @@ public function __construct(ContainerInterface $senderServiceLocator, array $mes
*/
public function getSendersForMessage($message): array
{
$senderIds = $this->messageToSenderIdsMapping[\get_class($message)] ?? $this->messageToSenderIdsMapping['*'] ?? array();

$senders = array();
foreach ($senderIds as $senderId) {
foreach ($this->getSenderIds($message) as $senderId) {
$senders[] = $this->senderServiceLocator->get($senderId);
}

return $senders;
}

private function getSenderIds($message): array
{
if (isset($this->messageToSenderIdsMapping[\get_class($message)])) {
return $this->messageToSenderIdsMapping[\get_class($message)];
}
if ($messageToSenderIdsMapping = array_intersect_key($this->messageToSenderIdsMapping, class_parents($message))) {
return current($messageToSenderIdsMapping);
}
if ($messageToSenderIdsMapping = array_intersect_key($this->messageToSenderIdsMapping, class_implements($message))) {
return current($messageToSenderIdsMapping);
}
if (isset($this->messageToSenderIdsMapping['*'])) {
return $this->messageToSenderIdsMapping['*'];
}

return array();
}
}
52 changes: 48 additions & 4 deletions src/Symfony/Component/Messenger/Tests/Asynchronous/Routing/SenderLocatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use Symfony\Component\DependencyInjection\Container;
use Symfony\Component\Messenger\Asynchronous\Routing\SenderLocator;
use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
use Symfony\Component\Messenger\Tests\Fixtures\DummyMessageInterface;
use Symfony\Component\Messenger\Tests\Fixtures\SecondMessage;
use Symfony\Component\Messenger\Transport\SenderInterface;

Expand All @@ -32,8 +33,47 @@ public function testItReturnsTheSenderBasedOnTheMessageClass()
),
));

$this->assertEquals(array($sender), $locator->getSendersForMessage(new DummyMessage('Hello')));
$this->assertEquals(array(), $locator->getSendersForMessage(new SecondMessage()));
$this->assertSame(array($sender), $locator->getSendersForMessage(new DummyMessage('Hello')));
$this->assertSame(array(), $locator->getSendersForMessage(new SecondMessage()));
}

public function testItReturnsTheSenderBasedOnTheMessageParentClass()
{
$container = new Container();

$sender = $this->getMockBuilder(SenderInterface::class)->getMock();
$container->set('my_amqp_sender', $sender);

$apiSender = $this->getMockBuilder(SenderInterface::class)->getMock();
$container->set('my_api_sender', $apiSender);

$locator = new SenderLocator($container, array(
DummyMessageInterface::class => array(
'my_api_sender',
),
DummyMessage::class => array(
'my_amqp_sender',
),
));
$this->assertSame(array($sender), $locator->getSendersForMessage(new ChildDummyMessage('Hello')));
$this->assertSame(array(), $locator->getSendersForMessage(new SecondMessage()));
}

public function testItReturnsTheSenderBasedOnTheMessageInterface()
{
$container = new Container();

$sender = $this->getMockBuilder(SenderInterface::class)->getMock();
$container->set('my_amqp_sender', $sender);

$locator = new SenderLocator($container, array(
DummyMessageInterface::class => array(
'my_amqp_sender',
),
));

$this->assertSame(array($sender), $locator->getSendersForMessage(new DummyMessage('Hello')));
$this->assertSame(array(), $locator->getSendersForMessage(new SecondMessage()));
}

public function testItSupportsAWildcardInsteadOfTheMessageClass()
Expand All @@ -55,7 +95,11 @@ public function testItSupportsAWildcardInsteadOfTheMessageClass()
),
));

$this->assertEquals(array($sender), $locator->getSendersForMessage(new DummyMessage('Hello')));
$this->assertEquals(array($apiSender), $locator->getSendersForMessage(new SecondMessage()));
$this->assertSame(array($sender), $locator->getSendersForMessage(new DummyMessage('Hello')));
$this->assertSame(array($apiSender), $locator->getSendersForMessage(new SecondMessage()));
}
}

class ChildDummyMessage extends DummyMessage
{
}
2 changes: 1 addition & 1 deletion src/Symfony/Component/Messenger/Tests/Fixtures/DummyMessage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Symfony\Component\Messenger\Tests\Fixtures;

class DummyMessage
class DummyMessage implements DummyMessageInterface
{
private $message;

Expand Down
7 changes: 7 additions & 0 deletions src/Symfony/Component/Messenger/Tests/Fixtures/DummyMessageInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php

namespace Symfony\Component\Messenger\Tests\Fixtures;

interface DummyMessageInterface
{
}