MCP-826: Use RabbitMQ for all consumers if AMQP is set in deployment config

- Fix static tests array_merge in loop

Author: aa-kashk

dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Consumer/DeprecatedConfigTest.php

@@ -6,6 +6,8 @@
 namespace Magento\Framework\MessageQueue\Consumer;
 
 use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItem\Handler\Iterator as HandlerIterator;
+use Magento\TestModuleMessageQueueConfiguration\AsyncHandler;
+use Magento\TestModuleMessageQueueConfiguration\SyncHandler;
 
 /**
  * Test access to consumer configuration declared in deprecated queue.xml configs using Consumer\ConfigInterface.
@@ -40,9 +42,9 @@ public function testGetConsumerMultipleHandlersFromCommunicationConfig()
         $this->assertInstanceOf(HandlerIterator::class, $handlers);
         $this->assertCount(2, $handlers);
         $this->assertEquals('methodWithBoolParam', $handlers[0]->getMethod());
-        $this->assertEquals(\Magento\TestModuleMessageQueueConfiguration\AsyncHandler::class, $handlers[0]->getType());
+        $this->assertEquals(AsyncHandler::class, $handlers[0]->getType());
         $this->assertEquals('methodWithMixedParam', $handlers[1]->getMethod());
-        $this->assertEquals(\Magento\TestModuleMessageQueueConfiguration\AsyncHandler::class, $handlers[1]->getType());
+        $this->assertEquals(AsyncHandler::class, $handlers[1]->getType());
     }
 
     public function testGetConsumerCustomHandler()
@@ -61,7 +63,7 @@ public function testGetConsumerCustomHandler()
         $this->assertInstanceOf(HandlerIterator::class, $handlers);
         $this->assertCount(1, $handlers);
         $this->assertEquals('methodWithMixedParam', $handlers[0]->getMethod());
-        $this->assertEquals(\Magento\TestModuleMessageQueueConfiguration\AsyncHandler::class, $handlers[0]->getType());
+        $this->assertEquals(AsyncHandler::class, $handlers[0]->getType());
     }
 
     public function testGetConsumerCustomConnectionSync()
@@ -80,7 +82,7 @@ public function testGetConsumerCustomConnectionSync()
         $this->assertInstanceOf(HandlerIterator::class, $handlers);
         $this->assertCount(1, $handlers);
         $this->assertEquals('methodWithBoolParam', $handlers[0]->getMethod());
-        $this->assertEquals(\Magento\TestModuleMessageQueueConfiguration\SyncHandler::class, $handlers[0]->getType());
+        $this->assertEquals(SyncHandler::class, $handlers[0]->getType());
     }
 
     public function testGetConsumerCustomConsumerAndMaxMessages()

lib/internal/Magento/Framework/Amqp/Bulk/Exchange.php

@@ -5,10 +5,10 @@
  */
 namespace Magento\Framework\Amqp\Bulk;
 
-use Magento\Framework\MessageQueue\Bulk\ExchangeInterface;
-use PhpAmqpLib\Message\AMQPMessage;
 use Magento\Framework\Communication\ConfigInterface as CommunicationConfigInterface;
+use Magento\Framework\MessageQueue\Bulk\ExchangeInterface;
 use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+use PhpAmqpLib\Message\AMQPMessage;
 
 /**
  * Used to send messages in bulk in AMQP queue.
@@ -76,10 +76,12 @@ public function enqueue($topic, array $envelopes)
         $exchange = $publisher->getConnection()->getExchange();
 
         foreach ($envelopes as $envelope) {
-            $msg = new AMQPMessage(
-                $envelope->getBody(),
-                array_merge(['delivery_mode' => 2], $envelope->getProperties())
-            );
+            $properties =[];
+            $properties['delivery_mode'] = 2;
+            foreach ($envelope->getProperties() as $key =>$value) {
+                $properties[$key] = $value;
+            }
+            $msg = new AMQPMessage($envelope->getBody(), $properties);
             $channel->batch_basic_publish($msg, $exchange, $topic);
         }
         $channel->publish_batch();

lib/internal/Magento/Framework/Amqp/ConnectionTypeResolver.php

@@ -40,7 +40,6 @@ public function __construct(DeploymentConfig $deploymentConfig)
     }
 
     /**
-     *
      * @inheritdoc
      * @since 103.0.0
      */

lib/internal/Magento/Framework/Data/Argument/Interpreter/Constant.php

@@ -13,7 +13,6 @@
 class Constant implements InterpreterInterface
 {
     /**
-     *
      * @inheritdoc
      * @return mixed
      * @throws \InvalidArgumentException