Commitc4532b0

committed

Fix negative delays with AMQP messenger transport

1 parent5b0ce48 commitc4532b0Copy full SHA for c4532b0

File tree

+31

-1

lines changed

src/Symfony/Component/Messenger/Bridge/Amqp
- Tests/Transport
  - ConnectionTest.php
- Transport
  - Connection.php

+31

-1

lines changed

Lines changed: 30 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -501,6 +501,36 @@ public function testItDelaysTheMessage()`
`501`	`501`	`$connection->publish('{}', ['x-some-headers' =>'foo'],5000);`
`502`	`502`	`}`
`503`	`503`
	`504`	`+publicfunctiontestItPublishesImmediatelyWithNegativeDelay()`
	`505`	`+ {`
	`506`	`+$factory =newTestAmqpFactory(`
	`507`	`+$amqpConnection =$this->createMock(\AMQPConnection::class),`
	`508`	`+$amqpChannel =$this->createMock(\AMQPChannel::class),`
	`509`	`+$amqpQueue =$this->createMock(\AMQPQueue::class),`
	`510`	`+$amqpExchange =$this->createMock(\AMQPExchange::class)`
	`511`	`+ );`
	`512`	`+`
	`513`	`+$amqpQueue->expects($this->once())->method('setName')->with('messages');`
	`514`	`+$amqpQueue->expects($this->never())->method('setArguments');`
	`515`	`+`
	`516`	`+$amqpQueue->expects($this->once())->method('declareQueue');`
	`517`	`+$amqpQueue->expects($this->once())->method('bind')->with('messages');`
	`518`	`+`
	`519`	`+$amqpExchange->expects($this->once())`
	`520`	`+ ->method('publish')`
	`521`	`+ ->with('{}',null, \AMQP_NOPARAM, [`
	`522`	`+'headers' => [`
	`523`	`+'x-some-headers' =>'foo',`
	`524`	`+ ],`
	`525`	`+'delivery_mode' =>2,`
	`526`	`+'timestamp' =>time(),`
	`527`	`+ ]);`
	`528`	`+`
	`529`	`+$connection = Connection::fromDsn('amqp://localhost', [],$factory);`
	`530`	`+`
	`531`	`+$connection->publish('{}', ['x-some-headers' =>'foo'], -5000);`
	`532`	`+ }`
	`533`	`+`
`504`	`534`	`publicfunctiontestItRetriesTheMessage()`
`505`	`535`	`{`
`506`	`536`	`$delayExchange =$this->createMock(\AMQPExchange::class);`

Lines changed: 1 addition & 1 deletion

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;`

Comments

(0)