Bugfixes

yiisoft · Dec 7, 2024 · f982680 · f982680
1 parent 1cc4438
commit f982680
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 111 deletions.
diff --git a/README.md b/README.md
@@ -170,7 +170,6 @@ $queue = $provider->get('channel-name');
 Out of the box, there are four implementations of the `QueueProviderInterface`:
 
 - `AdapterFactoryQueueProvider`
-- `QueueFactoryQueueProvider`
 - `PrototypeQueueProvider`
 - `CompositeQueueProvider`
 
@@ -195,10 +194,6 @@ use Yiisoft\Queue\Adapter\SynchronousAdapter;
 
 For more information about a definition formats available see the [factory](https://github.com/yiisoft/factory) documentation.
 
-### `QueueFactoryQueueProvider`
-
-Provider is similar to `AdapterFactoryQueueProvider`, but it uses definitions of channel-specific queues.
-
 ### `PrototypeQueueProvider`
 
 Queue provider that only changes the channel name of the base queue. It can be useful when your queues used the same

diff --git a/tests/Unit/Provider/CompositeQueueProviderTest.php b/tests/Unit/Provider/CompositeQueueProviderTest.php
@@ -4,23 +4,27 @@
 
 namespace Yiisoft\Queue\Tests\Unit\Provider;
 
+use Yiisoft\Queue\Provider\AdapterFactoryQueueProvider;
 use Yiisoft\Queue\Provider\ChannelNotFoundException;
 use Yiisoft\Queue\Provider\CompositeQueueProvider;
-use Yiisoft\Queue\Provider\QueueFactoryQueueProvider;
+use Yiisoft\Queue\Stubs\StubAdapter;
 use Yiisoft\Queue\Stubs\StubQueue;
 use Yiisoft\Queue\Tests\TestCase;
 
 final class CompositeQueueProviderTest extends TestCase
 {
     public function testBase(): void
     {
+        $queue = new StubQueue('channel');
         $provider = new CompositeQueueProvider(
-            new QueueFactoryQueueProvider([
-                'channel1' => new StubQueue('channel1'),
-            ]),
-            new QueueFactoryQueueProvider([
-                'channel2' => new StubQueue('channel2'),
-            ]),
+            new AdapterFactoryQueueProvider(
+                $queue,
+                ['channel1' => new StubAdapter()],
+            ),
+            new AdapterFactoryQueueProvider(
+                $queue,
+                ['channel2' => new StubAdapter()],
+            ),
         );
 
         $this->assertTrue($provider->has('channel1'));
@@ -34,13 +38,11 @@ public function testBase(): void
     public function testNotFound(): void
     {
         $provider = new CompositeQueueProvider(
-            new QueueFactoryQueueProvider([
-                'channel1' => new StubQueue(),
-            ]),
+            new AdapterFactoryQueueProvider(new StubQueue('channel'), ['channel1' => new StubAdapter()]),
         );
 
         $this->expectException(ChannelNotFoundException::class);
-        $this->expectExceptionMessage('Channel "not-exist" not found.');
-        $provider->get('not-exist');
+        $this->expectExceptionMessage('Channel "not-exists" not found.');
+        $provider->get('not-exists');
     }
 }
diff --git a/tests/Unit/Provider/QueueFactoryQueueProviderTest.php b/tests/Unit/Provider/QueueFactoryQueueProviderTest.php
diff --git a/tests/Unit/QueueTest.php b/tests/Unit/QueueTest.php
@@ -130,6 +130,10 @@ public function testAdapterNotConfiguredExceptionForRun(): void
 
     public function testRunWithSignalLoop(): void
     {
+        if (!extension_loaded('pcntl')) {
+            $this->markTestSkipped("This rest requires PCNTL extension");
+        }
+
         $this->loop = new SignalLoop();
         $queue = $this
             ->getQueue()