[client] fix simple client tests

Author: makasim

pkg/simple-client/SimpleClient.php

@@ -2,8 +2,9 @@
 
 namespace Enqueue\SimpleClient;
 
-use Enqueue\AmqpExt\Symfony\AmqpTransportFactory;
-use Enqueue\AmqpExt\Symfony\RabbitMqAmqpTransportFactory;
+use Enqueue\AmqpBunny\AmqpConnectionFactory as AmqpBunnyConnectionFactory;
+use Enqueue\AmqpExt\AmqpConnectionFactory as AmqpExtConnectionFactory;
+use Enqueue\AmqpLib\AmqpConnectionFactory as AmqpLibConnectionFactory;
 use Enqueue\Client\ArrayProcessorRegistry;
 use Enqueue\Client\Config;
 use Enqueue\Client\DelegateProcessor;
@@ -22,7 +23,9 @@
 use Enqueue\Sqs\Symfony\SqsTransportFactory;
 use Enqueue\Stomp\Symfony\RabbitMqStompTransportFactory;
 use Enqueue\Stomp\Symfony\StompTransportFactory;
+use Enqueue\Symfony\AmqpTransportFactory;
 use Enqueue\Symfony\DefaultTransportFactory;
+use Enqueue\Symfony\RabbitMqAmqpTransportFactory;
 use Interop\Queue\PsrContext;
 use Interop\Queue\PsrProcessor;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -46,17 +49,17 @@ final class SimpleClient
      *
      *$config = [
      *   'transport' => [
-     *     'default' => 'amqp',
-     *     'amqp'          => [], // amqp options here
+     *     'default' => 'amqp_ext',
+     *     'amqp_ext'          => [], // amqp options here
      *   ],
      * ]
      *
      * or a with all details:
      *
      * $config = [
      *   'transport' => [
-     *     'default' => 'amqp',
-     *     'amqp'          => [],
+     *     'default' => 'amqp_ext',
+     *     'amqp_ext'          => [],
      *     ....
      *   ],
      *   'client' => [
@@ -275,8 +278,6 @@ private function buildContainerExtension()
     {
         $map = [
             'default' => DefaultTransportFactory::class,
-            'amqp' => AmqpTransportFactory::class,
-            'rabbitmq_amqp' => RabbitMqAmqpTransportFactory::class,
             'dbal' => DbalTransportFactory::class,
             'fs' => FsTransportFactory::class,
             'redis' => RedisTransportFactory::class,
@@ -293,6 +294,21 @@ private function buildContainerExtension()
             }
         }
 
+        if (class_exists(AmqpExtConnectionFactory::class)) {
+            $extension->addTransportFactory(new AmqpTransportFactory(AmqpExtConnectionFactory::class, 'amqp_ext'));
+            $extension->addTransportFactory(new RabbitMqAmqpTransportFactory(AmqpExtConnectionFactory::class, 'rabbitmq_amqp_ext'));
+        }
+
+        if (class_exists(AmqpLibConnectionFactory::class)) {
+            $extension->addTransportFactory(new AmqpTransportFactory(AmqpLibConnectionFactory::class, 'amqp_lib'));
+            $extension->addTransportFactory(new RabbitMqAmqpTransportFactory(AmqpLibConnectionFactory::class, 'rabbitmq_amqp_lib'));
+        }
+
+        if (class_exists(AmqpBunnyConnectionFactory::class)) {
+            $extension->addTransportFactory(new AmqpTransportFactory(AmqpBunnyConnectionFactory::class, 'amqp_bunny'));
+            $extension->addTransportFactory(new RabbitMqAmqpTransportFactory(AmqpBunnyConnectionFactory::class, 'rabbitmq_amqp_bunny'));
+        }
+
         return $extension;
     }
 

pkg/simple-client/Tests/Functional/SimpleClientTest.php

@@ -33,8 +33,8 @@ public function transportConfigDataProvider()
     {
         yield 'amqp' => [[
             'transport' => [
-                'default' => 'amqp',
-                'amqp' => [
+                'default' => 'amqp_ext',
+                'amqp_ext' => [
                     'host' => getenv('SYMFONY__RABBITMQ__HOST'),
                     'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'),
                     'user' => getenv('SYMFONY__RABBITMQ__USER'),
@@ -48,8 +48,8 @@ public function transportConfigDataProvider()
 
         yield 'amqp_dsn' => [[
             'transport' => [
-                'default' => 'amqp',
-                'amqp' => getenv('AMQP_DSN'),
+                'default' => 'amqp_ext',
+                'amqp_ext' => getenv('AMQP_DSN'),
             ],
         ]];
 
@@ -61,8 +61,8 @@ public function transportConfigDataProvider()
 
         yield [[
             'transport' => [
-                'default' => 'rabbitmq_amqp',
-                'rabbitmq_amqp' => [
+                'default' => 'rabbitmq_amqp_ext',
+                'rabbitmq_amqp_ext' => [
                     'host' => getenv('SYMFONY__RABBITMQ__HOST'),
                     'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'),
                     'user' => getenv('SYMFONY__RABBITMQ__USER'),