adapter constructor

composer.json

@@ -40,7 +40,7 @@
         "psr/container": "^1.0|^2.0",
         "psr/log": "^2.0|^3.0",
         "symfony/console": "^5.4|^6.0",
-        "yiisoft/definitions": "^1.0|^2.0|^3.0",
+        "yiisoft/definitions": "dev-fix-union as 3.0.1",
         "yiisoft/factory": "^1.3",
         "yiisoft/friendly-exception": "^1.0",
         "yiisoft/injector": "^1.0"

src/Adapter/SynchronousAdapter.php

@@ -6,6 +6,7 @@
 
 use BackedEnum;
 use InvalidArgumentException;
+use Yiisoft\Queue\ChannelNormalizer;
 use Yiisoft\Queue\Enum\JobStatus;
 use Yiisoft\Queue\Message\MessageInterface;
 use Yiisoft\Queue\QueueInterface;
@@ -16,12 +17,14 @@ final class SynchronousAdapter implements AdapterInterface
 {
     private array $messages = [];
     private int $current = 0;
+    private string $channel;
 
     public function __construct(
         private WorkerInterface $worker,
         private QueueInterface $queue,
-        private string $channel = QueueInterface::DEFAULT_CHANNEL_NAME,
+        string|BackedEnum $channel = QueueInterface::DEFAULT_CHANNEL_NAME,
     ) {
+        $this->channel = ChannelNormalizer::normalize($channel);
     }
 
     public function __destruct()
@@ -77,7 +80,7 @@ public function subscribe(callable $handlerCallback): void
 
     public function withChannel(string|BackedEnum $channel): self
     {
-        $channel = $channel instanceof BackedEnum ? (string) $channel->value : $channel;
+        $channel = ChannelNormalizer::normalize($channel);
 
         if ($channel === $this->channel) {
             return $this;

src/ChannelNormalizer.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Queue;
+
+use BackedEnum;
+
+/**
+ * @internal
+ */
+final class ChannelNormalizer
+{
+    public static function normalize(string|BackedEnum $channel): string
+    {
+        return $channel instanceof BackedEnum ? (string) $channel->value : $channel;
+    }
+}

stubs/StubAdapter.php

@@ -6,6 +6,7 @@
 
 use BackedEnum;
 use Yiisoft\Queue\Adapter\AdapterInterface;
+use Yiisoft\Queue\ChannelNormalizer;
 use Yiisoft\Queue\Enum\JobStatus;
 use Yiisoft\Queue\Message\MessageInterface;
 use Yiisoft\Queue\QueueInterface;
@@ -15,8 +16,12 @@
  */
 final class StubAdapter implements AdapterInterface
 {
-    public function __construct(private string $channelName = QueueInterface::DEFAULT_CHANNEL_NAME)
-    {
+    private string $channelName;
+
+    public function __construct(
+        string|BackedEnum $channelName = QueueInterface::DEFAULT_CHANNEL_NAME
+    ) {
+        $this->channelName = ChannelNormalizer::normalize($channelName);
     }
 
     public function runExisting(callable $handlerCallback): void
@@ -40,7 +45,7 @@ public function subscribe(callable $handlerCallback): void
     public function withChannel(string|BackedEnum $channel): AdapterInterface
     {
         $new = clone $this;
-        $new->channelName = $channel instanceof BackedEnum ? (string) $channel->value : $channel;
+        $new->channelName = ChannelNormalizer::normalize($channel);
         return $new;
     }
 

tests/Unit/Adapter/SynchronousAdapterTest.php

@@ -99,18 +99,26 @@ public function testStatusNotMessage(): void
         $adapter->status('1');
     }
 
-    public static function dataWithChannel(): iterable
+    public static function dataChannels(): iterable
     {
         yield 'string' => ['test', 'test'];
         yield 'string-enum' => ['red', StringEnum::RED];
         yield 'integer-enum' => ['1', IntEnum::ONE];
     }
 
-    #[DataProvider('dataWithChannel')]
+    #[DataProvider('dataChannels')]
     public function testWithChannel(string $expected, mixed $channel): void
     {
         $adapter = (new SynchronousAdapter(new StubWorker(), new StubQueue()))->withChannel($channel);
 
         $this->assertSame($expected, $adapter->getChannelName());
     }
+
+    #[DataProvider('dataChannels')]
+    public function testChannelInConstructor(string $expected, mixed $channel): void
+    {
+        $adapter = new SynchronousAdapter(new StubWorker(), new StubQueue(), $channel);
+
+        $this->assertSame($expected, $adapter->getChannelName());
+    }
 }

tests/Unit/Stubs/StubAdapterTest.php

@@ -25,18 +25,26 @@ public function testBase(): void
         $adapter->subscribe(static fn() => null);
     }
 
-    public static function dataWithChannel(): iterable
+    public static function dataChannels(): iterable
     {
         yield 'string' => ['test', 'test'];
         yield 'string-enum' => ['red', StringEnum::RED];
         yield 'integer-enum' => ['1', IntEnum::ONE];
     }
 
-    #[DataProvider('dataWithChannel')]
+    #[DataProvider('dataChannels')]
     public function testWithChannel(string $expected, mixed $channel): void
     {
         $adapter = (new StubAdapter())->withChannel($channel);
 
         $this->assertSame($expected, $adapter->getChannelName());
     }
+
+    #[DataProvider('dataChannels')]
+    public function testChannelInConstructor(string $expected, mixed $channel): void
+    {
+        $adapter = new StubAdapter($channel);
+
+        $this->assertSame($expected, $adapter->getChannelName());
+    }
 }