Skip to content

Commit 5de27ec

Browse files
committed
修正 RedisQueueDriver、AMQPQueueDriver 的 pop 方法定义
1 parent c7e778c commit 5de27ec

File tree

2 files changed

+13
-19
lines changed

2 files changed

+13
-19
lines changed

src/Driver/IQueueDriver.php

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ public function push(IMessage $message, float $delay = 0, array $options = []):
2424

2525
/**
2626
* 从队列弹出一个消息.
27+
*
28+
* @param float $timeout 超时时间,单位:秒。值小于等于0时立即返回结果
2729
*/
2830
public function pop(float $timeout = 0): ?IMessage;
2931

src/Driver/RedisQueueDriver.php

+11-19
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ public function __construct(string $name, array $config = [])
5151
}
5252

5353
/**
54-
* 获取队列名称.
54+
* {@inheritDoc}
5555
*/
5656
public function getName(): string
5757
{
5858
return $this->name;
5959
}
6060

6161
/**
62-
* 推送消息到队列,返回消息ID.
62+
* {@inheritDoc}
6363
*/
6464
public function push(IMessage $message, float $delay = 0, array $options = []): string
6565
{
@@ -158,11 +158,9 @@ public function push(IMessage $message, float $delay = 0, array $options = []):
158158
}
159159

160160
/**
161-
* 从队列弹出一个消息.
162-
*
163-
* @param float $timeout 超时时间,单位:秒。值是-1时立即返回结果
161+
* {@inheritDoc}
164162
*/
165-
public function pop(float $timeout = -1): ?IMessage
163+
public function pop(float $timeout = 0): ?IMessage
166164
{
167165
$time = $useTime = 0;
168166
do
@@ -246,7 +244,7 @@ public function pop(float $timeout = -1): ?IMessage
246244
}
247245

248246
/**
249-
* 删除一个消息.
247+
* {@inheritDoc}
250248
*/
251249
public function delete(IMessage $message): bool
252250
{
@@ -286,9 +284,7 @@ public function delete(IMessage $message): bool
286284
}
287285

288286
/**
289-
* 清空队列.
290-
*
291-
* @param int|int[]|null $queueType 清空哪个队列,默认为全部
287+
* {@inheritDoc}
292288
*/
293289
public function clear($queueType = null): void
294290
{
@@ -309,7 +305,7 @@ public function clear($queueType = null): void
309305
}
310306

311307
/**
312-
* 将消息标记为成功
308+
* {@inheritDoc}
313309
*/
314310
public function success(IMessage $message): int
315311
{
@@ -346,7 +342,7 @@ public function success(IMessage $message): int
346342
}
347343

348344
/**
349-
* 将消息标记为失败.
345+
* {@inheritDoc}
350346
*/
351347
public function fail(IMessage $message, bool $requeue = false): int
352348
{
@@ -393,7 +389,7 @@ public function fail(IMessage $message, bool $requeue = false): int
393389
}
394390

395391
/**
396-
* 获取队列状态
392+
* {@inheritDoc}
397393
*/
398394
public function status(): QueueStatus
399395
{
@@ -420,9 +416,7 @@ public function status(): QueueStatus
420416
}
421417

422418
/**
423-
* 将失败消息恢复到队列.
424-
*
425-
* 返回恢复数量
419+
* {@inheritDoc}
426420
*/
427421
public function restoreFailMessages(): int
428422
{
@@ -456,9 +450,7 @@ public function restoreFailMessages(): int
456450
}
457451

458452
/**
459-
* 将超时消息恢复到队列.
460-
*
461-
* 返回恢复数量
453+
* {@inheritDoc}
462454
*/
463455
public function restoreTimeoutMessages(): int
464456
{

0 commit comments

Comments
 (0)