Use array for rate limiters instead of ContainerInterface

bobvandevijver · bobvandevijver · commit 08ebb0f2345b · 2022-08-18T12:36:23.000+02:00
diff --git a/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php b/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php
@@ -158,6 +158,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $receivers = [];
+        $rateLimiters = [];
         foreach ($receiverNames = $input->getArgument('receivers') as $receiverName) {
             if (!$this->receiverLocator->has($receiverName)) {
                 $message = sprintf('The receiver "%s" does not exist.', $receiverName);
@@ -169,6 +170,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             }
 
             $receivers[$receiverName] = $this->receiverLocator->get($receiverName);
+            if ($this->rateLimiterLocator->has($receiverName)) {
+                $rateLimiters[$receiverName] = $this->rateLimiterLocator->get($receiverName);
+            }
         }
 
         if (null !== $this->resetServicesListener && !$input->getOption('no-reset')) {
@@ -215,7 +219,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $bus = $input->getOption('bus') ? $this->routableBus->getMessageBus($input->getOption('bus')) : $this->routableBus;
 
-        $worker = new Worker($receivers, $bus, $this->eventDispatcher, $this->logger, $this->rateLimiterLocator);
+        $worker = new Worker($receivers, $bus, $this->eventDispatcher, $this->logger, $rateLimiters);
         $options = [
             'sleep' => $input->getOption('sleep') * 1000000,
         ];
diff --git a/src/Symfony/Component/Messenger/Tests/WorkerTest.php b/src/Symfony/Component/Messenger/Tests/WorkerTest.php
@@ -457,9 +457,8 @@ public function testWorkerRateLimitMessages()
             'limit' => 1,
             'interval' => '1 minute',
         ], new InMemoryStorage());
-        $rateLimiterLocator = new ServiceLocator(['bus' => fn () => $rateLimitFactory]);
 
-        $worker = new Worker(['bus' => $receiver], $bus, $eventDispatcher, null, $rateLimiterLocator);
+        $worker = new Worker(['bus' => $receiver], $bus, $eventDispatcher, null, ['bus' => $rateLimitFactory]);
         $worker->run();
 
         $this->assertCount(2, $receiver->getAcknowledgedEnvelopes());
diff --git a/src/Symfony/Component/Messenger/Worker.php b/src/Symfony/Component/Messenger/Worker.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Messenger;
 
-use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;
 use Symfony\Component\Messenger\Event\WorkerMessageHandledEvent;
@@ -49,12 +48,12 @@ class Worker
     private WorkerMetadata $metadata;
     private array $acks = [];
     private \SplObjectStorage $unacks;
-    private ?ContainerInterface $rateLimiterLocator;
+    private ?array $rateLimiters;
 
     /**
      * @param ReceiverInterface[] $receivers Where the key is the transport name
      */
-    public function __construct(array $receivers, MessageBusInterface $bus, EventDispatcherInterface $eventDispatcher = null, LoggerInterface $logger = null, ContainerInterface $rateLimiterLocator = null)
+    public function __construct(array $receivers, MessageBusInterface $bus, EventDispatcherInterface $eventDispatcher = null, LoggerInterface $logger = null, array $rateLimiters = null)
     {
         $this->receivers = $receivers;
         $this->bus = $bus;
@@ -64,7 +63,7 @@ public function __construct(array $receivers, MessageBusInterface $bus, EventDis
             'transportNames' => array_keys($receivers),
         ]);
         $this->unacks = new \SplObjectStorage();
-        $this->rateLimiterLocator = $rateLimiterLocator;
+        $this->rateLimiters = $rateLimiters;
     }
 
     /**
@@ -225,16 +224,16 @@ private function ack(): bool
 
     private function rateLimit(string $transportName): void
     {
-        if (!$this->rateLimiterLocator) {
+        if (!$this->rateLimiters) {
             return;
         }
 
-        if (!$this->rateLimiterLocator->has($transportName)) {
+        if (!array_key_exists($transportName, $this->rateLimiters)) {
             return;
         }
 
         /** @var LimiterInterface $rateLimiter */
-        $rateLimiter = $this->rateLimiterLocator->get($transportName)->create();
+        $rateLimiter = $this->rateLimiters[$transportName]->create();
         if ($rateLimiter->consume()->isAccepted()) {
             return;
         }
