Set channel name to a newly created adapter in QueueFactory

yiisoft · Aug 25, 2024 · de90119 · de90119
1 parent c076100
commit de90119
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/QueueFactory.php b/src/QueueFactory.php
@@ -76,7 +76,7 @@ private function create(string $channel): QueueInterface
         if (isset($this->channelConfiguration[$channel])) {
             $definition = $this->channelConfiguration[$channel];
             $this->checkDefinitionType($channel, $definition);
-            $adapter = $this->createFromDefinition($channel, $definition);
+            $adapter = $this->createFromDefinition($channel, $definition)->withChannel($channel);
 
             return $this->queue->withChannelName($channel)->withAdapter($adapter);
         }

diff --git a/tests/Unit/QueueFactoryTest.php b/tests/Unit/QueueFactoryTest.php
@@ -112,7 +112,10 @@ public function testThrowExceptionOnIncorrectDefinition(): void
     public function testSuccessfulDefinitionWithDefaultAdapter(): void
     {
         $adapterDefault = $this->createMock(AdapterInterface::class);
+        $adapterDefault->method('withChannel')->willReturn($adapterDefault);
+
         $adapterNew = $this->createMock(AdapterInterface::class);
+        $adapterNew->method('withChannel')->willReturn($adapterNew);
 
         $queue = $this->createMock(QueueInterface::class);
         $queue
@@ -142,6 +145,7 @@ public function testSuccessfulDefinitionWithDefaultAdapter(): void
     public function testSuccessfulDefinitionWithoutDefaultAdapter(): void
     {
         $adapterNew = $this->createMock(AdapterInterface::class);
+        $adapterNew->method('withChannel')->willReturn($adapterNew);
 
         $queue = $this->createMock(QueueInterface::class);
         $queue