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

- Fix static tests

Author: aa-kashk

app/code/Magento/MessageQueue/Setup/ConfigOptionsList.php

@@ -22,20 +22,20 @@ class ConfigOptionsList implements ConfigOptionsListInterface
     /**
      * Input key for the option
      */
-    const INPUT_KEY_QUEUE_CONSUMERS_WAIT_FOR_MESSAGES ='consumers-wait-for-messages';
-    const INPUT_KEY_QUEUE_DEFAULT_CONNECTION ='default-connection';
+    public const INPUT_KEY_QUEUE_CONSUMERS_WAIT_FOR_MESSAGES ='consumers-wait-for-messages';
+    public const INPUT_KEY_QUEUE_DEFAULT_CONNECTION ='default-connection';
 
     /**
      * Path to the values in the deployment config
      */
-    const CONFIG_PATH_QUEUE_CONSUMERS_WAIT_FOR_MESSAGES = 'queue/consumers_wait_for_messages';
-    const CONFIG_PATH_QUEUE_DEFAULT_CONNECTION = 'queue/default_connection';
+    public const CONFIG_PATH_QUEUE_CONSUMERS_WAIT_FOR_MESSAGES = 'queue/consumers_wait_for_messages';
+    public const CONFIG_PATH_QUEUE_DEFAULT_CONNECTION = 'queue/default_connection';
 
     /**
      * Default value
      */
-    const DEFAULT_CONSUMERS_WAIT_FOR_MESSAGES = 1;
-    const DEFAULT_QUEUE_CONNECTION = 'db';
+    public const DEFAULT_CONSUMERS_WAIT_FOR_MESSAGES = 1;
+    public const DEFAULT_QUEUE_CONNECTION = 'db';
 
     /**
      * The available configuration values

app/code/Magento/MysqlMq/Model/ConnectionTypeResolver.php

@@ -13,8 +13,6 @@
 class ConnectionTypeResolver implements ConnectionTypeResolverInterface
 {
     /**
-     * DB connection names.
-     *
      * @var string[]
      */
     private $dbConnectionNames;
@@ -31,7 +29,7 @@ public function __construct(array $dbConnectionNames = [])
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConnectionType($connectionName)
     {

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

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

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

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

lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/Converter/TopicConfig.php

@@ -21,9 +21,9 @@
  */
 class TopicConfig implements \Magento\Framework\Config\ConverterInterface
 {
-    const DEFAULT_TYPE = 'db';
-    const DEFAULT_EXCHANGE = 'magento';
-    const DEFAULT_INSTANCE = ConsumerInterface::class;
+    public const DEFAULT_TYPE = 'db';
+    public const DEFAULT_EXCHANGE = 'magento';
+    public const DEFAULT_INSTANCE = ConsumerInterface::class;
 
     /**
      * @var Validator
@@ -41,7 +41,6 @@ class TopicConfig implements \Magento\Framework\Config\ConverterInterface
     private $communicationConfig;
 
     /**
-     * Default value provider.
      *
      * @var DefaultValueProvider
      */
@@ -69,7 +68,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function convert($source)
     {

lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Converter.php

@@ -26,8 +26,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
     private $configParser;
 
     /**
-     * Default value provider.
-     *
      * @var DefaultValueProvider
      */
     private $defaultValueProvider;

lib/internal/Magento/Framework/MessageQueue/MessageIdGenerator.php

@@ -27,7 +27,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function generate($topicName)
     {

lib/internal/Magento/Framework/MessageQueue/Publisher.php

@@ -72,7 +72,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function publish($topicName, $data)
     {
@@ -85,7 +85,7 @@ public function publish($topicName, $data)
                     'delivery_mode' => 2,
                     // md5() here is not for cryptographic use.
                     // phpcs:ignore Magento2.Security.InsecureFunction
-                    'message_id' => md5(gethostname() . microtime(true) . uniqid($topicName,true))
+                    'message_id' => md5(gethostname() . microtime(true) . uniqid($topicName, true))
                 ]
             ]
         );

lib/internal/Magento/Framework/MessageQueue/Publisher/Config/Xml/Converter.php

@@ -21,8 +21,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
     private $booleanUtils;
 
     /**
-     * Default value provider.
-     *
      * @var DefaultValueProvider
      */
     private $defaultValueProvider;
@@ -40,7 +38,7 @@ public function __construct(BooleanUtils $booleanUtils, DefaultValueProvider $de
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function convert($source)
     {

lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/Converter.php

@@ -30,8 +30,6 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
     private $booleanUtils;
 
     /**
-     * Argument interpreter.
-     *
      * @var InterpreterInterface
      */
     private $argumentInterpreter;
@@ -59,7 +57,8 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function convert($source)
     {