Fix negative delays with AMQP messenger transport

hockdudu · hockdudu · commit c4532b0c0e92 · 2025-12-18T11:10:00.000+01:00
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php
@@ -501,6 +501,36 @@ public function testItDelaysTheMessage()
         $connection->publish('{}', ['x-some-headers' => 'foo'], 5000);
     }
 
+    public function testItPublishesImmediatelyWithNegativeDelay()
+    {
+        $factory = new TestAmqpFactory(
+            $amqpConnection = $this->createMock(\AMQPConnection::class),
+            $amqpChannel = $this->createMock(\AMQPChannel::class),
+            $amqpQueue = $this->createMock(\AMQPQueue::class),
+            $amqpExchange = $this->createMock(\AMQPExchange::class)
+        );
+
+        $amqpQueue->expects($this->once())->method('setName')->with('messages');
+        $amqpQueue->expects($this->never())->method('setArguments');
+
+        $amqpQueue->expects($this->once())->method('declareQueue');
+        $amqpQueue->expects($this->once())->method('bind')->with('messages');
+
+        $amqpExchange->expects($this->once())
+            ->method('publish')
+            ->with('{}', null, \AMQP_NOPARAM, [
+                'headers' => [
+                    'x-some-headers' => 'foo',
+                ],
+                'delivery_mode' => 2,
+                'timestamp' => time(),
+            ]);
+
+        $connection = Connection::fromDsn('amqp://localhost', [], $factory);
+
+        $connection->publish('{}', ['x-some-headers' => 'foo'], -5000);
+    }
+
     public function testItRetriesTheMessage()
     {
         $delayExchange = $this->createMock(\AMQPExchange::class);
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
@@ -289,7 +289,7 @@ public function publish(string $body, array $headers = [], int $delayInMs = 0, ?
         }
 
         $this->withConnectionExceptionRetry(function () use ($body, $headers, $delayInMs, $amqpStamp) {
-            if (0 !== $delayInMs) {
+            if (0 < $delayInMs) {
                 $this->publishWithDelay($body, $headers, $delayInMs, $amqpStamp);
 
                 return;

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ public function publish(string $body, array $headers = [], int $delayInMs = 0, ?`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`$this->withConnectionExceptionRetry(function () use ($body, $headers, $delayInMs, $amqpStamp) {`
`292`		`- if (0 !== $delayInMs) {`
	`292`	`+ if (0 < $delayInMs) {`
`293`	`293`	`$this->publishWithDelay($body, $headers, $delayInMs, $amqpStamp);`
`294`	`294`
`295`	`295`	`return;`