Skip to content

Commit b5790eb

Browse files
committed
[amqp] move amqp ext version check to connection factory.
1 parent 7bdb88d commit b5790eb

2 files changed

Lines changed: 73 additions & 49 deletions

File tree

‎pkg/amqp-ext/AmqpConnectionFactory.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ public function __construct($config = 'amqp://')
6262
implode('", "', $supportedMethods)
6363
));
6464
}
65+
66+
if ('basic_consume' == $this->config['receive_method']) {
67+
if (false == (version_compare(phpversion('amqp'), '1.9.1', '>=') || phpversion('amqp') == '1.9.1-dev')) {
68+
// @see https://github.com/php-enqueue/enqueue-dev/issues/110 and https://github.com/pdezwart/php-amqp/issues/281
69+
throw new \LogicException('The "basic_consume" method does not work on amqp extension prior 1.9.1 version.');
70+
}
71+
}
6572
}
6673

6774
/**

‎pkg/amqp-ext/AmqpConsumer.php‎

Lines changed: 66 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -72,22 +72,78 @@ public function getQueue()
7272
public function receive($timeout = 0)
7373
{
7474
if ('basic_get' == $this->receiveMethod) {
75-
$end = microtime(true) + ($timeout / 1000);
75+
return $this->receiveBasicGet($timeout);
76+
}
7677

77-
while (0 === $timeout || microtime(true) < $end) {
78-
if ($message = $this->receiveNoWait()) {
79-
return $message;
80-
}
81-
}
78+
if ('basic_consume' == $this->receiveMethod) {
79+
return $this->receiveBasicConsume($timeout);
80+
}
81+
82+
throw new \LogicException('The "receiveMethod" is not supported');
83+
}
8284

83-
return;
85+
/**
86+
* {@inheritdoc}
87+
*
88+
* @return AmqpMessage|null
89+
*/
90+
public function receiveNoWait()
91+
{
92+
if ($extMessage = $this->getExtQueue()->get()) {
93+
return $this->convertMessage($extMessage);
8494
}
95+
}
96+
97+
/**
98+
* {@inheritdoc}
99+
*
100+
* @param AmqpMessage $message
101+
*/
102+
public function acknowledge(PsrMessage $message)
103+
{
104+
InvalidMessageException::assertMessageInstanceOf($message, AmqpMessage::class);
105+
106+
$this->getExtQueue()->ack($message->getDeliveryTag());
107+
}
108+
109+
/**
110+
* {@inheritdoc}
111+
*
112+
* @param AmqpMessage $message
113+
*/
114+
public function reject(PsrMessage $message, $requeue = false)
115+
{
116+
InvalidMessageException::assertMessageInstanceOf($message, AmqpMessage::class);
117+
118+
$this->getExtQueue()->reject(
119+
$message->getDeliveryTag(),
120+
$requeue ? AMQP_REQUEUE : AMQP_NOPARAM
121+
);
122+
}
85123

86-
if (false == (version_compare(phpversion('amqp'), '1.9.1', '>=') || phpversion('amqp') == '1.9.1-dev')) {
87-
// @see https://github.com/php-enqueue/enqueue-dev/issues/110 and https://github.com/pdezwart/php-amqp/issues/281
88-
throw new \LogicException('The "basic_consume" method does not work on amqp extension prior 1.9.1 version.');
124+
/**
125+
* @param int $timeout
126+
*
127+
* @return AmqpMessage|null
128+
*/
129+
private function receiveBasicGet($timeout)
130+
{
131+
$end = microtime(true) + ($timeout / 1000);
132+
133+
while (0 === $timeout || microtime(true) < $end) {
134+
if ($message = $this->receiveNoWait()) {
135+
return $message;
136+
}
89137
}
138+
}
90139

140+
/**
141+
* @param int $timeout
142+
*
143+
* @return AmqpMessage|null
144+
*/
145+
private function receiveBasicConsume($timeout)
146+
{
91147
if ($this->isInit && $message = $this->buffer->pop($this->getExtQueue()->getConsumerTag())) {
92148
return $message;
93149
}
@@ -136,45 +192,6 @@ public function receive($timeout = 0)
136192
}
137193
}
138194

139-
/**
140-
* {@inheritdoc}
141-
*
142-
* @return AmqpMessage|null
143-
*/
144-
public function receiveNoWait()
145-
{
146-
if ($extMessage = $this->getExtQueue()->get()) {
147-
return $this->convertMessage($extMessage);
148-
}
149-
}
150-
151-
/**
152-
* {@inheritdoc}
153-
*
154-
* @param AmqpMessage $message
155-
*/
156-
public function acknowledge(PsrMessage $message)
157-
{
158-
InvalidMessageException::assertMessageInstanceOf($message, AmqpMessage::class);
159-
160-
$this->getExtQueue()->ack($message->getDeliveryTag());
161-
}
162-
163-
/**
164-
* {@inheritdoc}
165-
*
166-
* @param AmqpMessage $message
167-
*/
168-
public function reject(PsrMessage $message, $requeue = false)
169-
{
170-
InvalidMessageException::assertMessageInstanceOf($message, AmqpMessage::class);
171-
172-
$this->getExtQueue()->reject(
173-
$message->getDeliveryTag(),
174-
$requeue ? AMQP_REQUEUE : AMQP_NOPARAM
175-
);
176-
}
177-
178195
/**
179196
* @param \AMQPEnvelope $extEnvelope
180197
*

0 commit comments

Comments
 (0)