[Messenger] Add config option 'arguments' for delay queues

thomasbeaujean · thomasbeaujean · commit fc7d7ed2c985 · 2024-01-22T22:52:40.000+01:00
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/CHANGELOG.md b/src/Symfony/Component/Messenger/Bridge/Amqp/CHANGELOG.md
@@ -1,7 +1,7 @@
 CHANGELOG
 =========
 
-6.3
+6.4
 ---
 
  * Add option `delay[arguments]` in the transport definition
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
@@ -387,7 +387,7 @@ private function createDelayQueue(int $delay, ?string $routingKey, bool $isRetry
         $queue = $this->amqpFactory->createQueue($this->channel());
         $queue->setName($this->getRoutingKeyForDelay($delay, $routingKey, $isRetryAttempt));
         $queue->setFlags(\AMQP_DURABLE);
-        $defaultArguments = [
+        $queue->setArguments(array_merge([
             'x-message-ttl' => $delay,
             // delete the delay queue 10 seconds after the message expires
             // publishing another message redeclares the queue which renews the lease
@@ -398,10 +398,7 @@ private function createDelayQueue(int $delay, ?string $routingKey, bool $isRetry
             // after being released from to DLX, make sure the original routing key will be used
             // we must use an empty string instead of null for the argument to be picked up
             'x-dead-letter-routing-key' => $routingKey ?? '',
-        ];
-
-        $delayArguments = $this->connectionOptions['delay']['arguments'] ?? [];
-        $queue->setArguments(array_merge($defaultArguments, $delayArguments));
+        ], $this->connectionOptions['delay']['arguments'] ?? []));
 
         return $queue;
     }
