Can override implicit adapter

Author: dantleech

DependencyInjection/CmfRoutingAutoExtension.php

@@ -51,15 +51,31 @@ public function load(array $configs, ContainerBuilder $container)
             }
         }
         $container->setParameter('cmf_routing_auto.metadata.loader.resources', $resources);
-        $container->setParameter('cmf_routing_auto.adapter_name', $config['adapter']);
 
         $hasProvider = false;
 
+        $adapterName = null;
+        if (isset($config['adapter'])) {
+            $adapterName = $config['adapter'];
+        }
+
         if ($this->isConfigEnabled($container, $config['persistence']['phpcr'])) {
             $hasProvider = true;
             $loader->load('phpcr-odm.xml');
+            if (null === $adapterName) {
+                $adapterName = 'doctrine_phpcr_odm';
+            }
             $container->setParameter('cmf_routing_auto.persistence.phpcr.route_basepath', $config['persistence']['phpcr']['route_basepath']);
         }
+
+        if (false === $hasProvider && null === $adapterName) {
+            throw new InvalidConfigurationException(sprintf(
+                'No adapter has been configured, you either need to enable a persistence layer or '.
+                'explicitly specify an adapter using the "adapter" configuration key.'
+            ));
+        }
+
+        $container->setParameter('cmf_routing_auto.adapter_name', $adapterName);
     }
 
     protected function findMappingFiles($bundles)

DependencyInjection/Configuration.php

@@ -28,9 +28,7 @@ public function getConfigTreeBuilder()
         $treeBuilder->root('cmf_routing_auto')
             ->addDefaultsIfNotSet()
             ->children()
-                ->scalarNode('adapter')
-                    ->defaultValue('doctrine_phpcr_odm')
-                ->end()
+                ->scalarNode('adapter')->info('Use a specific adapter, overrides any implicit selection')->end()
                 ->booleanNode('auto_mapping')->defaultTrue()->end()
                 ->arrayNode('mapping')
                     ->fixXmlConfig('resource')

Tests/Unit/DependencyInjection/CmfRoutingAutoExtensionTest.php

@@ -17,31 +17,89 @@ public function setUp()
         ));
     }
 
-    protected function getContainerExtensions()
+    /**
+     * An exception should be thrown if an adapter has not been explicitly or
+     * implicitly configured.
+     *
+     * @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedExceptionMessage No adapter has been configured, you either need to 
+     */
+    public function testLoad()
     {
-        return array(
-            new CmfRoutingAutoExtension()
-        );
+        $this->setParameter('kernel.bundles', array());
+        $this->load();
     }
 
-    protected function loadPhpcrOdm()
+    /**
+     * It should be possible to explicitly specify an adapter
+     */
+    public function testExplicitAdapter()
     {
         $this->load(array(
+            'adapter' => 'foobar'
+        ));
+
+        $adapter = $this->container->getParameter('cmf_routing_auto.adapter_name');
+        $this->assertEquals('foobar', $adapter);
+    }
+
+    /**
+     * The adapter should be implicitly configured if the PHPCR ODM integration has
+     * been enabled
+     */
+    public function testImplicitPhpcrOdmAdapter()
+    {
+        $this->loadPhpcrOdm();
+
+        $adapter = $this->container->getParameter('cmf_routing_auto.adapter_name');
+        $this->assertEquals('doctrine_phpcr_odm', $adapter);
+    }
+
+    /**
+     * It should be possible to override the implicitly configured adapter
+     */
+    public function testOverrideImplicitPhpcrOdmAdapter()
+    {
+        $this->load(array(
+            'adapter' => 'foobar',
             'persistence' => array(
                 'phpcr' => array(
                     'enabled' => true
                 )
             )
         ));
+        $adapter = $this->container->getParameter('cmf_routing_auto.adapter_name');
+        $this->assertEquals('foobar', $adapter);
     }
 
+    /**
+     * The bundle should automatically register routing auto mapping configuration in
+     * the Resources/config directory.
+     */
     public function testAutoMappingRegistration()
     {
         $this->loadPhpcrOdm();
 
         $resources = $this->container->getParameter('cmf_routing_auto.metadata.loader.resources');
 
-        // both the YAML and the XML files in the TestBundle have been registered
         $this->assertCount(2, $resources);
     }
+
+    protected function getContainerExtensions()
+    {
+        return array(
+            new CmfRoutingAutoExtension()
+        );
+    }
+
+    protected function loadPhpcrOdm()
+    {
+        $this->load(array(
+            'persistence' => array(
+                'phpcr' => array(
+                    'enabled' => true
+                )
+            )
+        ));
+    }
 }

Tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -31,7 +31,6 @@ protected function getConfiguration()
     public function testSupportsAllConfigFormats()
     {
         $expectedConfiguration = array(
-            'adapter' => 'doctrine_phpcr_odm',
             'auto_mapping' => false,
             'mapping' => array(
                 'resources' => array(