changes in default transport factory

- set null transport if empty
- throw exception in neither dsn nor alias are set.

Author: makasim

pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php

@@ -52,13 +52,6 @@ public function addTransportFactory(TransportFactoryInterface $transportFactory)
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        // enable null transport by default.
-        array_unshift($configs, [
-            'transport' => [
-                'default' => 'null://',
-            ],
-        ]);
-
         $config = $this->processConfiguration(new Configuration($this->factories), $configs);
 
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));

pkg/enqueue-bundle/Tests/Unit/DependencyInjection/EnqueueExtensionTest.php

@@ -9,8 +9,8 @@
 use Enqueue\Client\TraceableProducer;
 use Enqueue\Null\NullContext;
 use Enqueue\Null\Symfony\NullTransportFactory;
-use Enqueue\Symfony\TransportFactoryInterface;
 use Enqueue\Symfony\DefaultTransportFactory;
+use Enqueue\Symfony\TransportFactoryInterface;
 use Enqueue\Test\ClassExtensionTrait;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -116,30 +116,6 @@ public function testShouldUseNullTransportAsDefaultWhenExplicitlyConfigured()
         );
     }
 
-    public function testShouldUseNullTransportAsDefaultConfiguredViaDSN()
-    {
-        $container = new ContainerBuilder();
-
-        $extension = new EnqueueExtension();
-        $extension->addTransportFactory(new NullTransportFactory());
-        $extension->addTransportFactory(new DefaultTransportFactory());
-
-        $extension->load([[
-            'transport' => [
-                'default' => 'null://',
-            ],
-        ]], $container);
-
-        self::assertEquals(
-            'enqueue.transport.default.context',
-            (string) $container->getAlias('enqueue.transport.context')
-        );
-        self::assertEquals(
-            'enqueue.transport.default_null.context',
-            (string) $container->getAlias('enqueue.transport.default.context')
-        );
-    }
-
     public function testShouldConfigureFooTransport()
     {
         $container = new ContainerBuilder();

pkg/enqueue/Symfony/DefaultTransportFactory.php

@@ -34,29 +34,40 @@ public function addConfiguration(ArrayNodeDefinition $builder)
     {
         $builder
             ->beforeNormalization()
-                ->ifString()
-                ->then(function ($v) {
-                    if (false === strpos($v, '://')) {
-                        return ['alias' => $v];
+                ->always(function ($v) {
+                    if (is_array($v)) {
+                        if (empty($v['dsn']) && empty($v['alias'])) {
+                            throw new \LogicException('Either dsn or alias option must be set');
+                        }
+
+                        return $v;
+                    }
+
+                    if (empty($v)) {
+                        return ['dsn' => 'null://'];
                     }
 
-                    return ['dsn' => $v];
+                    if (is_string($v)) {
+                        return false !== strpos($v, '://') ?
+                            ['dsn' => $v] :
+                            ['alias' => $v];
+                    }
                 })
             ->end()
             ->children()
                 ->scalarNode('alias')->cannotBeEmpty()->end()
                 ->scalarNode('dsn')->cannotBeEmpty()->end()
-            ;
+            ->end()
+        ->end()
+        ;
     }
 
     public function createConnectionFactory(ContainerBuilder $container, array $config)
     {
         if (isset($config['alias'])) {
             $aliasId = sprintf('enqueue.transport.%s.connection_factory', $config['alias']);
-        } elseif (isset($config['dsn'])) {
-            $aliasId = $this->findFactory($config['dsn'])->createConnectionFactory($container, $config);
         } else {
-            throw new \LogicException('Either dsn or alias option must be set.');
+            $aliasId = $this->findFactory($config['dsn'])->createConnectionFactory($container, $config);
         }
 
         $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName());
@@ -74,10 +85,8 @@ public function createContext(ContainerBuilder $container, array $config)
     {
         if (isset($config['alias'])) {
             $aliasId = sprintf('enqueue.transport.%s.context', $config['alias']);
-        } elseif (isset($config['dsn'])) {
-            $aliasId = $this->findFactory($config['dsn'])->createContext($container, $config);
         } else {
-            throw new \LogicException('Either dsn or alias option must be set.');
+            $aliasId = $this->findFactory($config['dsn'])->createContext($container, $config);
         }
 
         $contextId = sprintf('enqueue.transport.%s.context', $this->getName());
@@ -95,10 +104,8 @@ public function createDriver(ContainerBuilder $container, array $config)
     {
         if (isset($config['alias'])) {
             $aliasId = sprintf('enqueue.client.%s.driver', $config['alias']);
-        } elseif (isset($config['dsn'])) {
-            $aliasId = $this->findFactory($config['dsn'])->createDriver($container, $config);
         } else {
-            throw new \LogicException('Either dsn or alias option must be set.');
+            $aliasId = $this->findFactory($config['dsn'])->createDriver($container, $config);
         }
 
         $driverId = sprintf('enqueue.client.%s.driver', $this->getName());

pkg/enqueue/Tests/Symfony/DefaultTransportFactoryTest.php

@@ -72,58 +72,34 @@ public function testShouldAllowAddConfigurationAsDsn()
         $this->assertEquals(['dsn' => 'dsn://'], $config);
     }
 
-    public function testThrowIfNeitherDsnNorAliasConfiguredOnCreateConnectionFactory()
+    public function testShouldSetNullTransportByDefault()
     {
         $transport = new DefaultTransportFactory();
         $tb = new TreeBuilder();
         $rootNode = $tb->root('foo');
 
         $transport->addConfiguration($rootNode);
         $processor = new Processor();
-        $config = $processor->process($tb->buildTree(), [[]]);
 
-        // guard
-        $this->assertEquals([], $config);
+        $config = $processor->process($tb->buildTree(), [null]);
+        $this->assertEquals(['dsn' => 'null://'], $config);
 
-        $this->expectException(\LogicException::class);
-        $this->expectExceptionMessage('Either dsn or alias option must be set');
-        $transport->createConnectionFactory(new ContainerBuilder(), $config);
-    }
-
-    public function testThrowIfNeitherDsnNorAliasConfiguredOnCreateContext()
-    {
-        $transport = new DefaultTransportFactory();
-        $tb = new TreeBuilder();
-        $rootNode = $tb->root('foo');
-
-        $transport->addConfiguration($rootNode);
-        $processor = new Processor();
-        $config = $processor->process($tb->buildTree(), [[]]);
-
-        // guard
-        $this->assertEquals([], $config);
-
-        $this->expectException(\LogicException::class);
-        $this->expectExceptionMessage('Either dsn or alias option must be set');
-        $transport->createContext(new ContainerBuilder(), $config);
+        $config = $processor->process($tb->buildTree(), ['']);
+        $this->assertEquals(['dsn' => 'null://'], $config);
     }
 
-    public function testThrowIfNeitherDsnNorAliasConfiguredOnCreateDriver()
+    public function testThrowIfNeitherDsnNorAliasConfigured()
     {
         $transport = new DefaultTransportFactory();
         $tb = new TreeBuilder();
         $rootNode = $tb->root('foo');
 
         $transport->addConfiguration($rootNode);
         $processor = new Processor();
-        $config = $processor->process($tb->buildTree(), [[]]);
-
-        // guard
-        $this->assertEquals([], $config);
 
         $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('Either dsn or alias option must be set');
-        $transport->createDriver(new ContainerBuilder(), $config);
+        $processor->process($tb->buildTree(), [[]]);
     }
 
     public function testShouldCreateConnectionFactoryFromAlias()

pkg/enqueue/composer.json

@@ -13,14 +13,14 @@
     "require": {
         "php": ">=5.6",
         "enqueue/psr-queue": "^0.4",
+        "enqueue/null": "^0.4",
         "ramsey/uuid": "^2|^3.5"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.5",
         "symfony/console": "^2.8|^3",
         "symfony/dependency-injection": "^2.8|^3",
         "symfony/config": "^2.8|^3",
-        "enqueue/null": "^0.4",
         "enqueue/amqp-ext": "^0.4",
         "enqueue/fs": "^0.4",
         "enqueue/test": "^0.4",