Merge remote-tracking branch 'origin/AC-11673' into Hammer_248beta1_Scope03072024

Author: glo71317

lib/internal/Magento/Framework/Amqp/Connection/Factory.php

@@ -38,15 +38,7 @@ public function create(FactoryOptions $options): AbstractConnection
             $parameters['ssl_options'] = $options->getSslOptions() !== null
                 ? $options->getSslOptions()
                 : ['verify_peer' => true];
-            return ObjectManager::getInstance()->create($connectionType, $parameters);
         }
-        // need to revert the changes in scope of this ticket - AC-11673
-        return new AMQPStreamConnection(
-            $parameters['host'],
-            $parameters['port'],
-            $parameters['user'],
-            $parameters['password'],
-            $parameters['vhost']
-        );
+        return ObjectManager::getInstance()->create($connectionType, $parameters);
     }
 }

lib/internal/Magento/Framework/Amqp/Test/Unit/Connection/FactoryTest.php

@@ -121,10 +121,10 @@ public static function connectionDataProvider()
                 'ssl_enabled' => true,
                 'connection_class' => AMQPSSLConnection::class,
             ],
-//            [ // Need to revert in scope of this ticket - AC-11673
-//                'ssl_enabled' => false,
-//                'connection_class' => AMQPStreamConnection::class,
-//            ],
+            [
+                'ssl_enabled' => false,
+                'connection_class' => AMQPStreamConnection::class,
+            ],
         ];
     }