fix

monteiro · monteiro · commit 605fc7be203c · 2021-03-30T15:16:45.000+01:00
diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php
@@ -12,7 +12,6 @@
 
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;
 use Symfony\Component\Messenger\Stamp\DelayStamp;
@@ -35,7 +34,7 @@ class SendFailedMessageToFailureTransportListener implements EventSubscriberInte
      */
     public function __construct($failureSenders, LoggerInterface $logger = null)
     {
-        if (!$failureSenders instanceof ServiceLocator) {
+        if (!$failureSenders instanceof ContainerInterface) {
             trigger_deprecation('symfony/messenger', '5.3', 'Passing a SenderInterface value as 1st argument to "%s()" is deprecated, pass a ServiceLocator instead.', __METHOD__);
         }
 
@@ -99,6 +98,6 @@ private function getFailureSender(string $receiverName): SenderInterface
 
     private function hasFailureTransports(WorkerMessageFailedEvent $event): bool
     {
-        return ($this->failureSenders instanceof ServiceLocator && $this->failureSenders->has($event->getReceiverName())) || $this->failureSenders instanceof SenderInterface;
+        return ($this->failureSenders instanceof ContainerInterface && $this->failureSenders->has($event->getReceiverName())) || $this->failureSenders instanceof SenderInterface;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`
`13`	`13`	`use Psr\Container\ContainerInterface;`
`14`	`14`	`use Psr\Log\LoggerInterface;`
`15`		`-use Symfony\Component\DependencyInjection\ServiceLocator;`
`16`	`15`	`use Symfony\Component\EventDispatcher\EventSubscriberInterface;`
`17`	`16`	`use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;`
`18`	`17`	`use Symfony\Component\Messenger\Stamp\DelayStamp;`
`@@ -35,7 +34,7 @@ class SendFailedMessageToFailureTransportListener implements EventSubscriberInte`
`35`	`34`	`*/`
`36`	`35`	`public function __construct($failureSenders, LoggerInterface $logger = null)`
`37`	`36`	`{`
`38`		`- if (!$failureSenders instanceof ServiceLocator) {`
	`37`	`+ if (!$failureSenders instanceof ContainerInterface) {`
`39`	`38`	`trigger_deprecation('symfony/messenger', '5.3', 'Passing a SenderInterface value as 1st argument to "%s()" is deprecated, pass a ServiceLocator instead.', __METHOD__);`
`40`	`39`	`}`
`41`	`40`
`@@ -99,6 +98,6 @@ private function getFailureSender(string $receiverName): SenderInterface`
`99`	`98`
`100`	`99`	`private function hasFailureTransports(WorkerMessageFailedEvent $event): bool`
`101`	`100`	`{`
`102`		`- return ($this->failureSenders instanceof ServiceLocator && $this->failureSenders->has($event->getReceiverName())) \|\| $this->failureSenders instanceof SenderInterface;`
	`101`	`+ return ($this->failureSenders instanceof ContainerInterface && $this->failureSenders->has($event->getReceiverName())) \|\| $this->failureSenders instanceof SenderInterface;`
`103`	`102`	`}`
`104`	`103`	`}`