[amqp] One single transport factory for all supported amqp implementations.

Author: makasim

EnqueueBundle.php

@@ -2,9 +2,6 @@
 
 namespace Enqueue\Bundle;
 
-use Enqueue\AmqpBunny\AmqpConnectionFactory as AmqpBunnyConnectionFactory;
-use Enqueue\AmqpExt\AmqpConnectionFactory as AmqpExtConnectionFactory;
-use Enqueue\AmqpLib\AmqpConnectionFactory as AmqpLibConnectionFactory;
 use Enqueue\AsyncEventDispatcher\DependencyInjection\AsyncEventsPass;
 use Enqueue\AsyncEventDispatcher\DependencyInjection\AsyncTransformersPass;
 use Enqueue\Bundle\DependencyInjection\Compiler\BuildClientExtensionsPass;
@@ -55,15 +52,8 @@ public function build(ContainerBuilder $container)
             $extension->addTransportFactory(new RabbitMqStompTransportFactory());
         }
 
-        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'));
-        }
+        $extension->addTransportFactory(new AmqpTransportFactory('amqp'));
+        $extension->addTransportFactory(new RabbitMqAmqpTransportFactory('rabbitmq_amqp'));
 
         if (class_exists(FsConnectionFactory::class)) {
             $extension->addTransportFactory(new FsTransportFactory());
@@ -81,11 +71,6 @@ public function build(ContainerBuilder $container)
             $extension->addTransportFactory(new SqsTransportFactory());
         }
 
-        if (class_exists(AmqpBunnyConnectionFactory::class)) {
-            $extension->addTransportFactory(new AmqpTransportFactory(AmqpBunnyConnectionFactory::class, 'amqp_bunny'));
-            $extension->addTransportFactory(new RabbitMqAmqpTransportFactory(AmqpBunnyConnectionFactory::class, 'rabbitmq_amqp_bunny'));
-        }
-
         $container->addCompilerPass(new AsyncEventsPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 100);
         $container->addCompilerPass(new AsyncTransformersPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 100);
     }

Tests/Functional/UseCasesTest.php

@@ -23,10 +23,11 @@ public function setUp()
 
     public function provideEnqueueConfigs()
     {
-        yield 'amqp_ext' => [[
+        yield 'amqp' => [[
             'transport' => [
-                'default' => 'amqp_ext',
-                'amqp_ext' => [
+                'default' => 'amqp',
+                'amqp' => [
+                    'driver' => 'ext',
                     'host' => getenv('SYMFONY__RABBITMQ__HOST'),
                     'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'),
                     'user' => getenv('SYMFONY__RABBITMQ__USER'),
@@ -39,8 +40,8 @@ public function provideEnqueueConfigs()
 
         yield 'amqp_dsn' => [[
             'transport' => [
-                'default' => 'amqp_ext',
-                'amqp_ext' => getenv('AMQP_DSN'),
+                'default' => 'amqp',
+                'amqp' => getenv('AMQP_DSN'),
             ],
         ]];
 

Tests/Unit/EnqueueBundleTest.php

@@ -2,9 +2,6 @@
 
 namespace Enqueue\Bundle\Tests\Unit;
 
-use Enqueue\AmqpBunny\AmqpConnectionFactory as AmqpBunnyConnectionFactory;
-use Enqueue\AmqpExt\AmqpConnectionFactory as AmqpExtConnectionFactory;
-use Enqueue\AmqpLib\AmqpConnectionFactory as AmqpLibConnectionFactory;
 use Enqueue\Bundle\DependencyInjection\Compiler\BuildClientExtensionsPass;
 use Enqueue\Bundle\DependencyInjection\Compiler\BuildClientRoutingPass;
 use Enqueue\Bundle\DependencyInjection\Compiler\BuildConsumptionExtensionsPass;
@@ -113,7 +110,7 @@ public function testShouldRegisterStompAndRabbitMqStompTransportFactories()
         $bundle->build($container);
     }
 
-    public function testShouldRegisterAmqpExtAndRabbitMqAmqpExtTransportFactories()
+    public function testShouldRegisterAmqpAndRabbitMqAmqpTransportFactories()
     {
         $extensionMock = $this->createEnqueueExtensionMock();
 
@@ -125,43 +122,15 @@ public function testShouldRegisterAmqpExtAndRabbitMqAmqpExtTransportFactories()
             ->method('addTransportFactory')
             ->with($this->isInstanceOf(AmqpTransportFactory::class))
             ->willReturnCallback(function (AmqpTransportFactory $factory) {
-                $this->assertSame(AmqpExtConnectionFactory::class, $factory->getAmqpConnectionFactoryClass());
+                $this->assertSame('amqp', $factory->getName());
             })
         ;
         $extensionMock
             ->expects($this->at(3))
             ->method('addTransportFactory')
             ->with($this->isInstanceOf(RabbitMqAmqpTransportFactory::class))
-            ->willReturnCallback(function (AmqpTransportFactory $factory) {
-                $this->assertSame(AmqpExtConnectionFactory::class, $factory->getAmqpConnectionFactoryClass());
-            })
-        ;
-
-        $bundle = new EnqueueBundle();
-        $bundle->build($container);
-    }
-
-    public function testShouldRegisterAmqpLibAndRabbitMqAmqpLibTransportFactories()
-    {
-        $extensionMock = $this->createEnqueueExtensionMock();
-
-        $container = new ContainerBuilder();
-        $container->registerExtension($extensionMock);
-
-        $extensionMock
-            ->expects($this->at(4))
-            ->method('addTransportFactory')
-            ->with($this->isInstanceOf(AmqpTransportFactory::class))
-            ->willReturnCallback(function (AmqpTransportFactory $factory) {
-                $this->assertSame(AmqpLibConnectionFactory::class, $factory->getAmqpConnectionFactoryClass());
-            })
-        ;
-        $extensionMock
-            ->expects($this->at(5))
-            ->method('addTransportFactory')
-            ->with($this->isInstanceOf(RabbitMqAmqpTransportFactory::class))
-            ->willReturnCallback(function (AmqpTransportFactory $factory) {
-                $this->assertSame(AmqpLibConnectionFactory::class, $factory->getAmqpConnectionFactoryClass());
+            ->willReturnCallback(function (RabbitMqAmqpTransportFactory $factory) {
+                $this->assertSame('rabbitmq_amqp', $factory->getName());
             })
         ;
 
@@ -177,7 +146,7 @@ public function testShouldRegisterFSTransportFactory()
         $container->registerExtension($extensionMock);
 
         $extensionMock
-            ->expects($this->at(6))
+            ->expects($this->at(4))
             ->method('addTransportFactory')
             ->with($this->isInstanceOf(FsTransportFactory::class))
         ;
@@ -194,7 +163,7 @@ public function testShouldRegisterRedisTransportFactory()
         $container->registerExtension($extensionMock);
 
         $extensionMock
-            ->expects($this->at(7))
+            ->expects($this->at(5))
             ->method('addTransportFactory')
             ->with($this->isInstanceOf(RedisTransportFactory::class))
         ;
@@ -211,7 +180,7 @@ public function testShouldRegisterDbalTransportFactory()
         $container->registerExtension($extensionMock);
 
         $extensionMock
-            ->expects($this->at(8))
+            ->expects($this->at(6))
             ->method('addTransportFactory')
             ->with($this->isInstanceOf(DbalTransportFactory::class))
         ;
@@ -228,7 +197,7 @@ public function testShouldRegisterSqsTransportFactory()
         $container->registerExtension($extensionMock);
 
         $extensionMock
-            ->expects($this->at(9))
+            ->expects($this->at(7))
             ->method('addTransportFactory')
             ->with($this->isInstanceOf(SqsTransportFactory::class))
         ;
@@ -237,34 +206,6 @@ public function testShouldRegisterSqsTransportFactory()
         $bundle->build($container);
     }
 
-    public function testShouldRegisterAmqpBunnyTransportFactory()
-    {
-        $extensionMock = $this->createEnqueueExtensionMock();
-
-        $container = new ContainerBuilder();
-        $container->registerExtension($extensionMock);
-
-        $extensionMock
-            ->expects($this->at(10))
-            ->method('addTransportFactory')
-            ->with($this->isInstanceOf(AmqpTransportFactory::class))
-            ->willReturnCallback(function (AmqpTransportFactory $factory) {
-                $this->assertSame(AmqpBunnyConnectionFactory::class, $factory->getAmqpConnectionFactoryClass());
-            })
-        ;
-        $extensionMock
-            ->expects($this->at(11))
-            ->method('addTransportFactory')
-            ->with($this->isInstanceOf(RabbitMqAmqpTransportFactory::class))
-            ->willReturnCallback(function (AmqpTransportFactory $factory) {
-                $this->assertSame(AmqpBunnyConnectionFactory::class, $factory->getAmqpConnectionFactoryClass());
-            })
-        ;
-
-        $bundle = new EnqueueBundle();
-        $bundle->build($container);
-    }
-
     /**
      * @return \PHPUnit_Framework_MockObject_MockObject|EnqueueExtension
      */