Skip to content

Commit 01bb1ca

Browse files
authored
Merge pull request #499 from php-enqueue/dbal-fix-delay-time-conversion
[BC break][dbal] Fix time conversion in DbalDriver.
2 parents 3d1fbca + 6d1e2cc commit 01bb1ca

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Diff for: pkg/dbal/Client/DbalDriver.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function createTransportMessage(Message $message)
7171
$transportMessage->setProperties($properties);
7272
$transportMessage->setMessageId($message->getMessageId());
7373
$transportMessage->setTimestamp($message->getTimestamp());
74-
$transportMessage->setDeliveryDelay($message->getDelay());
74+
$transportMessage->setDeliveryDelay($message->getDelay() * 1000);
7575
$transportMessage->setReplyTo($message->getReplyTo());
7676
$transportMessage->setCorrelationId($message->getCorrelationId());
7777
if (array_key_exists($message->getPriority(), self::$priorityMap)) {
@@ -97,7 +97,7 @@ public function createClientMessage(PsrMessage $message)
9797
$clientMessage->setContentType($message->getHeader('content_type'));
9898
$clientMessage->setMessageId($message->getMessageId());
9999
$clientMessage->setTimestamp($message->getTimestamp());
100-
$clientMessage->setDelay($message->getDeliveryDelay());
100+
$clientMessage->setDelay($message->getDeliveryDelay() / 1000);
101101
$clientMessage->setReplyTo($message->getReplyTo());
102102
$clientMessage->setCorrelationId($message->getCorrelationId());
103103

Diff for: pkg/dbal/Tests/Client/DbalDriverTest.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function testShouldConvertTransportMessageToClientMessage()
117117
$this->assertSame('MessageId', $clientMessage->getMessageId());
118118
$this->assertSame('ContentType', $clientMessage->getContentType());
119119
$this->assertSame(1000, $clientMessage->getTimestamp());
120-
$this->assertSame(12345, $clientMessage->getDelay());
120+
$this->assertSame(12.345, $clientMessage->getDelay());
121121

122122
$this->assertNull($clientMessage->getExpire());
123123
$this->assertSame(MessagePriority::NORMAL, $clientMessage->getPriority());
@@ -134,6 +134,7 @@ public function testShouldConvertClientMessageToTransportMessage()
134134
$clientMessage->setPriority(MessagePriority::VERY_HIGH);
135135
$clientMessage->setMessageId('MessageId');
136136
$clientMessage->setTimestamp(1000);
137+
$clientMessage->setDelay(23);
137138

138139
$context = $this->createPsrContextMock();
139140
$context
@@ -165,6 +166,7 @@ public function testShouldConvertClientMessageToTransportMessage()
165166
], $transportMessage->getProperties());
166167
$this->assertSame('MessageId', $transportMessage->getMessageId());
167168
$this->assertSame(1000, $transportMessage->getTimestamp());
169+
$this->assertSame(23000, $transportMessage->getDeliveryDelay());
168170
}
169171

170172
public function testShouldSendMessageToRouter()

0 commit comments

Comments
 (0)