Merge pull request #31 from AlexanderForks/custom-driver

Add support for registering custom drivers

Author: henrikbjorn

DependencyInjection/BernardExtension.php

@@ -15,8 +15,6 @@ protected function loadInternal(array $config, ContainerBuilder $container)
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.xml');
 
-        $container->setAlias('bernard.driver', 'bernard.driver.'.$config['driver']);
-
         switch ($config['driver']) {
             case 'doctrine':
                 $this->registerDoctrineConfiguration($config['options'], $container);
@@ -51,6 +49,12 @@ protected function loadInternal(array $config, ContainerBuilder $container)
                 break;
         }
 
+        if ($config['driver'] === 'custom') {
+            $container->setAlias('bernard.driver', $config['options']['custom_service']);
+        } else {
+            $container->setAlias('bernard.driver', 'bernard.driver.'.$config['driver']);
+        }
+
         $this->registerListeners($config['listeners'], $container);
     }
 

DependencyInjection/Configuration.php

@@ -18,7 +18,7 @@ public function getConfigTreeBuilder()
                 ->enumNode('driver')
                     ->isRequired()
                     ->cannotBeEmpty()
-                    ->values(['doctrine', 'file', 'phpamqp', 'phpredis', 'predis', 'ironmq', 'sqs', 'pheanstalk'])
+                    ->values(['doctrine', 'file', 'phpamqp', 'phpredis', 'predis', 'ironmq', 'sqs', 'pheanstalk', 'custom'])
                 ->end()
 
                 ->arrayNode('options')
@@ -42,6 +42,7 @@ public function getConfigTreeBuilder()
                         ->end()
                         ->scalarNode('prefetch')->defaultNull()->end()
                         ->scalarNode('pheanstalk_service')->defaultNull()->end()
+                        ->scalarNode('custom_service')->defaultNull()->end()
                     ->end()
                 ->end()
 
@@ -83,6 +84,7 @@ public function getConfigTreeBuilder()
             ->validateDriver($root, 'ironmq', 'ironmq_service')
             ->validateDriver($root, 'sqs', 'sqs_service')
             ->validateDriver($root, 'pheanstalk', 'pheanstalk_service')
+            ->validateDriver($root, 'custom', 'custom_service')
         ;
 
         return $tree;

Tests/DependencyInjection/ConfigurationTest.php

@@ -36,6 +36,7 @@ public function testDefaults()
             'sqs_service'                        => null,
             'sqs_queue_map'                      => [],
             'pheanstalk_service'                 => null,
+            'custom_service'                     => null,
         ], $config['options']);
     }
 
@@ -101,6 +102,15 @@ public function testPheanstalkDriverRequiresServiceOptionToBeSet()
         $this->processConfig(['driver' => 'pheanstalk']);
     }
 
+    /**
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedExceptionMessage The "custom_service" option must be defined when using the "custom" driver.
+     */
+    public function testCustomDriverRequiresServiceOptionToBeSet()
+    {
+        $this->processConfig(['driver' => 'custom']);
+    }
+
     /**
      * @param array $config
      *