Skip to content

Commit 735746f

Browse files
committed
fix delivery tag
1 parent 3ed36b9 commit 735746f

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

pkg/amqp-bunny/AmqpContext.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ public function convertMessage(Message $bunnyMessage): InteropAmqpMessage
327327
}
328328

329329
$message = new AmqpMessage($bunnyMessage->content, $properties, $headers);
330-
$message->setDeliveryTag((string) $bunnyMessage->deliveryTag);
330+
$message->setDeliveryTag((int) $bunnyMessage->deliveryTag);
331331
$message->setRedelivered($bunnyMessage->redelivered);
332332
$message->setRoutingKey($bunnyMessage->routingKey);
333333

pkg/amqp-bunny/Tests/AmqpConsumerTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function testOnAcknowledgeShouldAcknowledgeMessage()
6868
->method('ack')
6969
->with($this->isInstanceOf(Message::class))
7070
->willReturnCallback(function (Message $message) {
71-
$this->assertSame('theDeliveryTag', $message->deliveryTag);
71+
$this->assertSame(145, $message->deliveryTag);
7272
});
7373

7474
$context = $this->createContextMock();
@@ -81,7 +81,7 @@ public function testOnAcknowledgeShouldAcknowledgeMessage()
8181
$consumer = new AmqpConsumer($context, new AmqpQueue('aName'));
8282

8383
$message = new AmqpMessage();
84-
$message->setDeliveryTag('theDeliveryTag');
84+
$message->setDeliveryTag(145);
8585

8686
$consumer->acknowledge($message);
8787
}
@@ -94,7 +94,7 @@ public function testOnRejectShouldRejectMessage()
9494
->method('reject')
9595
->with($this->isInstanceOf(Message::class), false)
9696
->willReturnCallback(function (Message $message) {
97-
$this->assertSame('theDeliveryTag', $message->deliveryTag);
97+
$this->assertSame(167, $message->deliveryTag);
9898
});
9999

100100
$context = $this->createContextMock();
@@ -107,7 +107,7 @@ public function testOnRejectShouldRejectMessage()
107107
$consumer = new AmqpConsumer($context, new AmqpQueue('aName'));
108108

109109
$message = new AmqpMessage();
110-
$message->setDeliveryTag('theDeliveryTag');
110+
$message->setDeliveryTag(167);
111111

112112
$consumer->reject($message, false);
113113
}
@@ -120,7 +120,7 @@ public function testOnRejectShouldRequeueMessage()
120120
->method('reject')
121121
->with($this->isInstanceOf(Message::class), true)
122122
->willReturnCallback(function (Message $message) {
123-
$this->assertSame('theDeliveryTag', $message->deliveryTag);
123+
$this->assertSame(178, $message->deliveryTag);
124124
});
125125

126126
$context = $this->createContextMock();
@@ -133,7 +133,7 @@ public function testOnRejectShouldRequeueMessage()
133133
$consumer = new AmqpConsumer($context, new AmqpQueue('aName'));
134134

135135
$message = new AmqpMessage();
136-
$message->setDeliveryTag('theDeliveryTag');
136+
$message->setDeliveryTag(178);
137137

138138
$consumer->reject($message, true);
139139
}

pkg/amqp-lib/AmqpContext.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ public function convertMessage(LibAMQPMessage $amqpMessage): InteropAmqpMessage
309309
unset($headers['application_headers']);
310310

311311
$message = new AmqpMessage($amqpMessage->getBody(), $properties, $headers);
312-
$message->setDeliveryTag($amqpMessage->delivery_info['delivery_tag']);
312+
$message->setDeliveryTag((int) $amqpMessage->delivery_info['delivery_tag']);
313313
$message->setRedelivered($amqpMessage->delivery_info['redelivered']);
314314
$message->setRoutingKey($amqpMessage->delivery_info['routing_key']);
315315

pkg/amqp-lib/Tests/AmqpConsumerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function testOnAcknowledgeShouldAcknowledgeMessage()
6767
$channel
6868
->expects($this->once())
6969
->method('basic_ack')
70-
->with('delivery-tag')
70+
->with(167)
7171
;
7272

7373
$context = $this->createContextMock();
@@ -80,7 +80,7 @@ public function testOnAcknowledgeShouldAcknowledgeMessage()
8080
$consumer = new AmqpConsumer($context, new AmqpQueue('aName'));
8181

8282
$message = new AmqpMessage();
83-
$message->setDeliveryTag('delivery-tag');
83+
$message->setDeliveryTag(167);
8484

8585
$consumer->acknowledge($message);
8686
}
@@ -91,7 +91,7 @@ public function testOnRejectShouldRejectMessage()
9191
$channel
9292
->expects($this->once())
9393
->method('basic_reject')
94-
->with('delivery-tag', $this->isTrue())
94+
->with(125, $this->isTrue())
9595
;
9696

9797
$context = $this->createContextMock();
@@ -104,7 +104,7 @@ public function testOnRejectShouldRejectMessage()
104104
$consumer = new AmqpConsumer($context, new AmqpQueue('aName'));
105105

106106
$message = new AmqpMessage();
107-
$message->setDeliveryTag('delivery-tag');
107+
$message->setDeliveryTag(125);
108108

109109
$consumer->reject($message, true);
110110
}

0 commit comments

Comments
 (0)