set the RoutingBundle generic_controller if ContentBundle is available

lsmith77 · lsmith77 · commit 1219a4ded865 · 2013-08-09T22:32:14.000+02:00
diff --git a/DependencyInjection/CmfCoreExtension.php b/DependencyInjection/CmfCoreExtension.php
@@ -20,6 +20,8 @@ class CmfCoreExtension extends Extension implements PrependExtensionInterface
      */
     public function prepend(ContainerBuilder $container)
     {
+        $bundles = $container->getParameter('kernel.bundles');
+
         // process the configuration of SymfonyCmfCoreExtension
         $configs = $container->getExtensionConfig($this->getAlias());
         $parameterBag = $container->getParameterBag();
@@ -122,6 +124,10 @@ public function prepend(ContainerBuilder $container)
                                 )
                             )
                         );
+
+                        if (isset($bundles['CmfContentBundle'])) {
+                            $prependConfig['dynamic']['generic_controller'] = 'cmf_content.controller:indexAction';
+                        }
                         break;
 /*
                     case 'cmf_simple_cms':

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ class CmfCoreExtension extends Extension implements PrependExtensionInterface`
`20`	`20`	`*/`
`21`	`21`	`public function prepend(ContainerBuilder $container)`
`22`	`22`	`{`
	`23`	`+ $bundles = $container->getParameter('kernel.bundles');`
	`24`	`+`
`23`	`25`	`// process the configuration of SymfonyCmfCoreExtension`
`24`	`26`	`$configs = $container->getExtensionConfig($this->getAlias());`
`25`	`27`	`$parameterBag = $container->getParameterBag();`
`@@ -122,6 +124,10 @@ public function prepend(ContainerBuilder $container)`
`122`	`124`	`)`
`123`	`125`	`)`
`124`	`126`	`);`
	`127`	`+`
	`128`	`+ if (isset($bundles['CmfContentBundle'])) {`
	`129`	`+ $prependConfig['dynamic']['generic_controller'] = 'cmf_content.controller:indexAction';`
	`130`	`+ }`
`125`	`131`	`break;`
`126`	`132`	`/*`
`127`	`133`	`case 'cmf_simple_cms':`