Also prepend RoutingBundle ORM config

Author: wouterj

DependencyInjection/CmfCoreExtension.php

@@ -203,6 +203,24 @@ public function prepend(ContainerBuilder $container)
                 $prependConfig = array();
 
                 switch ($name) {
+                    case 'cmf_routing':
+                        $prependConfig = array(
+                            'dynamic' => array(
+                                'enabled' => true,
+                                'persistence' => array(
+                                    'orm' => array(
+                                        'enabled' => $persistenceConfig['enabled'],
+                                        'manager_name' => $persistenceConfig['manager_name'],
+                                    )
+                                )
+                            )
+                        );
+
+                        if (isset($bundles['CmfContentBundle'])) {
+                            $prependConfig['dynamic']['generic_controller'] = 'cmf_content.controller:indexAction';
+                        }
+                        break;
+
                     case 'cmf_seo':
                         $prependConfig = array(
                             'persistence' => array(
@@ -212,6 +230,7 @@ public function prepend(ContainerBuilder $container)
                             ),
                             'sonata_admin_extension' => $persistenceConfig['use_sonata_admin'],
                         );
+                        break;
                 }
 
                 if ($prependConfig) {

DependencyInjection/Configuration.php

@@ -48,12 +48,13 @@ public function getConfigTreeBuilder()
                             ->addDefaultsIfNotSet()
                             ->canBeEnabled()
                             ->children()
+                                ->scalarNode('manager_name')->defaultNull()->end()
                                 ->enumNode('use_sonata_admin')
                                     ->values(array(true, false, 'auto'))
                                     ->defaultValue('auto')
                                 ->end()
                             ->end()
-                        ->end()
+                        ->end() // orm
                     ->end()
                 ->end()
                 ->arrayNode('multilang')