ACP2E-847: [PHP 8.1] Deprecated Functionality in Framework/Amqp

Author: bubasuma

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

@@ -23,20 +23,20 @@ class Config
     /**
      * Queue config key
      */
-    const QUEUE_CONFIG = 'queue';
+    public const QUEUE_CONFIG = 'queue';
 
     /**
      * Amqp config key
      */
-    const AMQP_CONFIG = 'amqp';
+    public const AMQP_CONFIG = 'amqp';
 
-    const HOST = 'host';
-    const PORT = 'port';
-    const USERNAME = 'user';
-    const PASSWORD = 'password';
-    const VIRTUALHOST = 'virtualhost';
-    const SSL = 'ssl';
-    const SSL_OPTIONS = 'ssl_options';
+    public const HOST = 'host';
+    public const PORT = 'port';
+    public const USERNAME = 'user';
+    public const PASSWORD = 'password';
+    public const VIRTUALHOST = 'virtualhost';
+    public const SSL = 'ssl';
+    public const SSL_OPTIONS = 'ssl_options';
 
     /**
      * Deployment configuration
@@ -140,7 +140,7 @@ public function getValue($key)
      */
     private function createConnection(): AbstractConnection
     {
-        $sslEnabled = trim($this->getValue(self::SSL)) === 'true';
+        $sslEnabled = $this->getValue(self::SSL) && trim($this->getValue(self::SSL)) === 'true';
         $options = new FactoryOptions();
         $options->setHost($this->getValue(self::HOST));
         $options->setPort($this->getValue(self::PORT));

lib/internal/Magento/Framework/Amqp/Test/Unit/ConfigTest.php

@@ -8,8 +8,9 @@
 namespace Magento\Framework\Amqp\Test\Unit;
 
 use Magento\Framework\Amqp\Config;
+use Magento\Framework\Amqp\Connection\Factory as ConnectionFactory;
+use Magento\Framework\Amqp\Connection\FactoryOptions;
 use Magento\Framework\App\DeploymentConfig;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -21,9 +22,9 @@ class ConfigTest extends TestCase
     private $deploymentConfigMock;
 
     /**
-     * @var ObjectManager
+     * @var ConnectionFactory
      */
-    private $objectManager;
+    private $connectionFactory;
 
     /**
      * @var Config
@@ -32,17 +33,12 @@ class ConfigTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->objectManager = new ObjectManager($this);
         $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
             ->disableOriginalConstructor()
             ->setMethods(['getConfigData'])
             ->getMock();
-        $this->amqpConfig = $this->objectManager->getObject(
-            Config::class,
-            [
-                'config' => $this->deploymentConfigMock,
-            ]
-        );
+        $this->connectionFactory = $this->createMock(ConnectionFactory::class);
+        $this->amqpConfig = new Config($this->deploymentConfigMock, 'amqp', $this->connectionFactory);
     }
 
     public function testGetNullConfig()
@@ -140,4 +136,70 @@ public function testGetCustomConfig()
         $this->assertEquals($expectedSsl, $amqpConfig->getValue(Config::SSL));
         $this->assertEquals('randomValue', $amqpConfig->getValue('randomKey'));
     }
+
+    /**
+     * @param array $config
+     * @param array $expected
+     * @return void
+     * @dataProvider configDataProvider
+     */
+    public function testCreateConnection(array $config, array $expected): void
+    {
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('getConfigData')
+            ->with(Config::QUEUE_CONFIG)
+            ->willReturn(
+                [
+                    Config::AMQP_CONFIG => $config
+                ]
+            );
+        $this->connectionFactory->expects($this->once())
+            ->method('create')
+            ->with(
+                $this->callback(
+                    function (FactoryOptions $factoryOptions) use ($expected) {
+                        $actual = [];
+                        foreach (array_keys($expected) as $method) {
+                            $actual[$method] = $factoryOptions->$method();
+                        }
+                        return $actual === $expected;
+                    }
+                )
+            );
+        $this->amqpConfig->getChannel();
+    }
+
+    /**
+     * @return array
+     */
+    public function configDataProvider(): array
+    {
+        return [
+            [
+                [
+                    Config::HOST => 'localhost',
+                    Config::PORT => '5672',
+                    Config::USERNAME => 'user',
+                    Config::PASSWORD => 'pass',
+                    Config::VIRTUALHOST => '/',
+                ],
+                [
+                    'isSslEnabled' => false
+                ]
+            ],
+            [
+                [
+                    Config::HOST => 'localhost',
+                    Config::PORT => '5672',
+                    Config::USERNAME => 'user',
+                    Config::PASSWORD => 'pass',
+                    Config::VIRTUALHOST => '/',
+                    Config::SSL => ' true ',
+                ],
+                [
+                    'isSslEnabled' => true
+                ]
+            ]
+        ];
+    }
 }