Fixed return senders based on the message interface

yceruto · yceruto · commit 966ebb1d6713 · 2018-05-07T13:40:12.000-04:00
diff --git a/src/Symfony/Component/Messenger/Asynchronous/Routing/SenderLocator.php b/src/Symfony/Component/Messenger/Asynchronous/Routing/SenderLocator.php
@@ -32,7 +32,14 @@ public function __construct(ContainerInterface $senderServiceLocator, array $mes
      */
     public function getSendersForMessage($message): array
     {
-        $senderIds = $this->messageToSenderIdsMapping[\get_class($message)] ?? $this->messageToSenderIdsMapping['*'] ?? array();
+        $senderIds = array();
+        if (isset($this->messageToSenderIdsMapping[\get_class($message)])) {
+            $senderIds = $this->messageToSenderIdsMapping[\get_class($message)];
+        } elseif ($messageToSenderIdsMapping = array_intersect_key($this->messageToSenderIdsMapping, class_implements($message, false))) {
+            $senderIds = current($messageToSenderIdsMapping);
+        } elseif (isset($this->messageToSenderIdsMapping['*'])) {
+            $senderIds = $this->messageToSenderIdsMapping['*'];
+        }
 
         $senders = array();
         foreach ($senderIds as $senderId) {
diff --git a/src/Symfony/Component/Messenger/Tests/Asynchronous/Routing/SenderLocatorTest.php b/src/Symfony/Component/Messenger/Tests/Asynchronous/Routing/SenderLocatorTest.php
@@ -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;
 
@@ -36,6 +37,22 @@ public function testItReturnsTheSenderBasedOnTheMessageClass()
         $this->assertEquals(array(), $locator->getSendersForMessage(new SecondMessage()));
     }
 
+    public function testItReturnsTheSenderBasedOnTheMessageInterface()
+    {
+        $sender = $this->getMockBuilder(SenderInterface::class)->getMock();
+        $container = new Container();
+        $container->set('my_amqp_sender', $sender);
+
+        $locator = new SenderLocator($container, array(
+            DummyMessageInterface::class => array(
+                'my_amqp_sender',
+            ),
+        ));
+
+        $this->assertEquals(array($sender), $locator->getSendersForMessage(new DummyMessage('Hello')));
+        $this->assertEquals(array(), $locator->getSendersForMessage(new SecondMessage()));
+    }
+
     public function testItSupportsAWildcardInsteadOfTheMessageClass()
     {
         $container = new Container();
diff --git a/src/Symfony/Component/Messenger/Tests/Fixtures/DummyMessage.php b/src/Symfony/Component/Messenger/Tests/Fixtures/DummyMessage.php
@@ -2,7 +2,7 @@
 
 namespace Symfony\Component\Messenger\Tests\Fixtures;
 
-class DummyMessage
+class DummyMessage implements DummyMessageInterface
 {
     private $message;
 
diff --git a/src/Symfony/Component/Messenger/Tests/Fixtures/DummyMessageInterface.php b/src/Symfony/Component/Messenger/Tests/Fixtures/DummyMessageInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\Messenger\Tests\Fixtures;
+
+interface DummyMessageInterface
+{
+}

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Symfony\Component\Messenger\Tests\Fixtures;`
`4`	`4`
`5`		`-class DummyMessage`
	`5`	`+class DummyMessage implements DummyMessageInterface`
`6`	`6`	`{`
`7`	`7`	`private $message;`
`8`	`8`