review feedback

dbu · dbu · commit 85fb3f5a95c7 · 2021-01-12T09:57:38.000+01:00
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpReceiver.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpReceiver.php
@@ -17,7 +17,6 @@
 use Symfony\Component\Messenger\Exception\TransportException;
 use Symfony\Component\Messenger\Transport\Receiver\MessageCountAwareInterface;
 use Symfony\Component\Messenger\Transport\Receiver\QueueReceiverInterface;
-use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
 use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 
@@ -26,7 +25,7 @@
  *
  * @author Samuel Roze <samuel.roze@gmail.com>
  */
-class AmqpReceiver implements ReceiverInterface, QueueReceiverInterface, MessageCountAwareInterface
+class AmqpReceiver implements QueueReceiverInterface, MessageCountAwareInterface
 {
     private $serializer;
     private $connection;
diff --git a/src/Symfony/Component/Messenger/Tests/WorkerTest.php b/src/Symfony/Component/Messenger/Tests/WorkerTest.php
@@ -249,20 +249,23 @@ public function testWorkerWithMultipleReceivers()
 
     public function testWorkerLimitQueues()
     {
-        $receiver1 = $this->createMock(QueueReceiverInterface::class);
-        $receiver1->expects($this->once())
+        $envelope = [new Envelope(new DummyMessage('message1'))];
+        $receiver = $this->createMock(QueueReceiverInterface::class);
+        $receiver->expects($this->once())
             ->method('getFromQueues')
             ->with(['foo'])
-            ->willReturn([new Envelope(new DummyMessage('message1'))])
+            ->willReturn($envelope)
+        ;
+        $receiver->expects($this->never())
+            ->method('get')
         ;
 
         $bus = $this->getMockBuilder(MessageBusInterface::class)->getMock();
 
         $dispatcher = new EventDispatcher();
         $dispatcher->addSubscriber(new StopWorkerOnMessageLimitListener(1));
 
-        $worker = new Worker([$receiver1], $bus, $dispatcher);
-        $this->expectException(RuntimeException::class);
+        $worker = new Worker(['transport' => $receiver], $bus, $dispatcher);
         $worker->run(['queues' => ['foo']]);
     }
 
@@ -273,8 +276,9 @@ public function testWorkerLimitQueuesUnsupported()
 
         $bus = $this->getMockBuilder(MessageBusInterface::class)->getMock();
 
-        $worker = new Worker([$receiver1, $receiver2], $bus);
+        $worker = new Worker(['transport1' => $receiver1, 'transport2' => $receiver2], $bus);
         $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage(sprintf('Receiver for transport2 does not implement %s', QueueReceiverInterface::class));
         $worker->run(['queues' => ['foo']]);
     }
 
diff --git a/src/Symfony/Component/Messenger/Transport/Receiver/QueueReceiverInterface.php b/src/Symfony/Component/Messenger/Transport/Receiver/QueueReceiverInterface.php
@@ -17,8 +17,10 @@
  * Some transports may have multiple queues. This interface is used to read from only some queues.
  *
  * @author David Buchmann <mail@davidbu.ch>
+ *
+ * @experimental in 5.3
  */
-interface QueueReceiverInterface
+interface QueueReceiverInterface extends ReceiverInterface
 {
     /**
      * Get messages from the specified queue names instead of consuming from all queues.

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,10 @@`
`17`	`17`	`* Some transports may have multiple queues. This interface is used to read from only some queues.`
`18`	`18`	`*`
`19`	`19`	`* @author David Buchmann <mail@davidbu.ch>`
	`20`	`+ *`
	`21`	`+ * @experimental in 5.3`
`20`	`22`	`*/`
`21`		`-interface QueueReceiverInterface`
	`23`	`+interface QueueReceiverInterface extends ReceiverInterface`
`22`	`24`	`{`
`23`	`25`	`/**`
`24`	`26`	`* Get messages from the specified queue names instead of consuming from all queues.`