[Messenger][Amqp] Call setType of the exchange with a proper default type

ilyachase · ilyachase · commit 8e0752499782 · 2024-08-15T16:32:34.000+05:00
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php
@@ -884,7 +884,7 @@ public function testGettingDefaultExchange()
 
         $amqpExchange = $this->createMock(\AMQPExchange::class);
         $amqpExchange->expects($this->once())->method('setName')->with('');
-        $amqpExchange->expects($this->never())->method('setType');
+        $amqpExchange->expects($this->once())->method('setType')->with(\AMQP_EX_TYPE_DIRECT);
         $amqpExchange->expects($this->never())->method('setFlags');
         $amqpExchange->expects($this->never())->method('setArguments');
 
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
@@ -539,8 +539,9 @@ public function exchange(): \AMQPExchange
         if (!isset($this->amqpExchange)) {
             $this->amqpExchange = $this->amqpFactory->createExchange($this->channel());
             $this->amqpExchange->setName($this->exchangeOptions['name']);
+            $defaultExchangeType = '' !== $this->exchangeOptions['name'] ? \AMQP_EX_TYPE_FANOUT : \AMQP_EX_TYPE_DIRECT;
+            $this->amqpExchange->setType($this->exchangeOptions['type'] ?? $defaultExchangeType);
             if ('' !== $this->exchangeOptions['name']) {
-                $this->amqpExchange->setType($this->exchangeOptions['type'] ?? \AMQP_EX_TYPE_FANOUT);
                 $this->amqpExchange->setFlags($this->exchangeOptions['flags'] ?? \AMQP_DURABLE);
 
                 if (isset($this->exchangeOptions['arguments'])) {
