Merge pull request #133 from symfony-cmf/seo_bundle

[WCM] Reflect SeoBundle configuration changes

Author: lsmith77

DependencyInjection/CmfCoreExtension.php

@@ -31,7 +31,7 @@ class CmfCoreExtension extends Extension implements PrependExtensionInterface
      */
     public function prepend(ContainerBuilder $container)
     {
-        // process the configuration of SymfonyCmfCoreExtension
+        // process the configuration of CmfCoreExtension
         $configs = $container->getExtensionConfig($this->getAlias());
         $parameterBag = $container->getParameterBag();
         $configs = $parameterBag->resolveValue($configs);
@@ -182,11 +182,54 @@ public function prepend(ContainerBuilder $container)
                             'persistence' => array(
                                 'phpcr' => array(
                                     'enabled' => $persistenceConfig['enabled'],
-                                    'use_sonata_admin' => $persistenceConfig['use_sonata_admin'],
-                                    'content_basepath' => $persistenceConfig['basepath'].'/content',
+                                ),
+                            ),
+                            'sonata_admin_extension' => $persistenceConfig['use_sonata_admin'],
+                        );
+                        break;
+                }
+
+                if ($prependConfig) {
+                    $container->prependExtensionConfig($name, $prependConfig);
+                }
+            }
+        }
+
+        if ($config['persistence']['orm']) {
+            $bundles = $container->getParameter('kernel.bundles');
+            $persistenceConfig = $config['persistence']['orm'];
+
+            foreach ($container->getExtensions() as $name => $extension) {
+                $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(
+                                'orm' => array(
+                                    'enabled' => $persistenceConfig['enabled'],
+                                ),
+                            ),
+                            'sonata_admin_extension' => $persistenceConfig['use_sonata_admin'],
+                        );
                         break;
                 }
 

DependencyInjection/Configuration.php

@@ -43,7 +43,18 @@ public function getConfigTreeBuilder()
                                 ->end()
                                 ->scalarNode('translation_strategy')->defaultNull()->end()
                             ->end()
-                        ->end()
+                        ->end() // phpcr
+                        ->arrayNode('orm')
+                            ->addDefaultsIfNotSet()
+                            ->canBeEnabled()
+                            ->children()
+                                ->scalarNode('manager_name')->defaultNull()->end()
+                                ->enumNode('use_sonata_admin')
+                                    ->values(array(true, false, 'auto'))
+                                    ->defaultValue('auto')
+                                ->end()
+                            ->end()
+                        ->end() // orm
                     ->end()
                 ->end()
                 ->arrayNode('multilang')