From 6639261ea9a626e37b1af40d33a7478929677ca7 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Wed, 28 Oct 2026 03:06:33 +0300 Subject: [PATCH] Use DefaultQueue::NAME instead of removed QueueProviderInterface::DEFAULT_QUEUE yiisoft/queue#321 removed Provider\QueueProviderInterface, so the adapter could not be loaded with the current yiisoft/queue. The default queue name keeps its value, yii-queue. --- src/Adapter.php | 4 ++-- tests/AdapterTest.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Adapter.php b/src/Adapter.php index 65841ff..174d50f 100644 --- a/src/Adapter.php +++ b/src/Adapter.php @@ -18,7 +18,7 @@ use Yiisoft\Db\Query\Query; use Yiisoft\Mutex\MutexFactoryInterface; use Yiisoft\Mutex\MutexInterface; -use Yiisoft\Queue\Provider\QueueProviderInterface; +use Yiisoft\Queue\DefaultQueue; use Exception; use function is_array; @@ -56,7 +56,7 @@ public function __construct( private MessageSerializerInterface $serializer, private LoopInterface $loop, private MutexFactoryInterface $mutexFactory, - private string $channel = QueueProviderInterface::DEFAULT_QUEUE, + private string $channel = DefaultQueue::NAME, ) { $this->mutex = $this->mutexFactory->create(self::class . $this->channel); } diff --git a/tests/AdapterTest.php b/tests/AdapterTest.php index 22c2a81..2bd7b95 100644 --- a/tests/AdapterTest.php +++ b/tests/AdapterTest.php @@ -16,7 +16,7 @@ use Yiisoft\Queue\Message\GenericMessage; use Yiisoft\Queue\Message\IdEnvelope; use Yiisoft\Queue\Message\Serializer\MessageSerializerInterface; -use Yiisoft\Queue\Provider\QueueProviderInterface; +use Yiisoft\Queue\DefaultQueue; use function in_array; @@ -49,7 +49,7 @@ public function testPushUsesMessageMetaAndReturnsIdEnvelope(): void ->expects(self::once()) ->method('insert') ->with('{{%queue}}', self::callback(static function (array $row): bool { - return $row['channel'] === QueueProviderInterface::DEFAULT_QUEUE + return $row['channel'] === DefaultQueue::NAME && $row['job'] === 'serialized-message' && $row['ttr'] === 10 && $row['delay'] === 5.0 @@ -93,7 +93,7 @@ public function testWithChannelClonesAdapterAndUsesNewChannelMutex(): void ->method('create') ->with(self::callback(static function (string $name) use (&$mutexNames): bool { $mutexNames[] = $name; - return in_array($name, [Adapter::class . QueueProviderInterface::DEFAULT_QUEUE, Adapter::class . 'mail'], true); + return in_array($name, [Adapter::class . DefaultQueue::NAME, Adapter::class . 'mail'], true); })) ->willReturn($this->createMock(MutexInterface::class)); @@ -104,7 +104,7 @@ public function testWithChannelClonesAdapterAndUsesNewChannelMutex(): void $new = $adapter->withChannel('mail'); self::assertNotSame($adapter, $new); - self::assertSame([Adapter::class . QueueProviderInterface::DEFAULT_QUEUE, Adapter::class . 'mail'], $mutexNames); + self::assertSame([Adapter::class . DefaultQueue::NAME, Adapter::class . 'mail'], $mutexNames); } private function createAdapter(