Merge pull request #167 from symfony-cmf/validate-generic-controller

validate generic_controller in di extension and reformat code

Author: dbu

CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+* **2013-08-09**: dynamic.generic_controller is now defaulting to null instead
+  of the controller from CmfContentBundle. CmfCoreBundle is prepending the
+  CmfContentBundle generic controller if that bundle is present. If you do not
+  have Core and Content, you need to configure the value explicitly if you want
+  routes specifying a template to use the generic controller or have
+  template_by_class mapping configuration.
+
 1.1.0-RC2
 ---------
 

DependencyInjection/CmfRoutingExtension.php

@@ -72,13 +72,8 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
         $container->setParameter($this->getAlias() . '.controllers_by_type', $config['controllers_by_type']);
         $container->setParameter($this->getAlias() . '.controllers_by_class', $config['controllers_by_class']);
         $container->setParameter($this->getAlias() . '.templates_by_class', $config['templates_by_class']);
-        // if the content class defines the template, we also need to make sure we use the generic controller for those routes
-        $controllerForTemplates = array();
-        foreach ($config['templates_by_class'] as $key => $value) {
-            $controllerForTemplates[$key] = $config['generic_controller'];
-        }
-        $container->setParameter($this->getAlias() . '.defined_templates_class', $controllerForTemplates);
         $container->setParameter($this->getAlias() . '.uri_filter_regexp', $config['uri_filter_regexp']);
+
         $locales = false;
         if (isset($config['locales'])) {
             $locales = $config['locales'];
@@ -131,9 +126,21 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
         if (!empty($config['controllers_by_class'])) {
             $dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer_controllers_by_class')));
         }
-        if (!empty($config['generic_controller']) && !empty($config['templates_by_class'])) {
-            $dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer_controller_for_templates_by_class')));
+
+        if (!empty($config['templates_by_class'])) {
             $dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer_templates_by_class')));
+
+            if (null === $config['generic_controller']) {
+                throw new InvalidConfigurationException('If you configure templates_by_class, you need to configure a generic_router. If you are sure you do not need a generic router, set the field to false to disable explicitly.');
+            } elseif (is_string($config['generic_controller'])) {
+                // if the content class defines the template, we also need to make sure we use the generic controller for those routes
+                $controllerForTemplates = array();
+                foreach ($config['templates_by_class'] as $key => $value) {
+                    $controllerForTemplates[$key] = $config['generic_controller'];
+                }
+                $container->setParameter($this->getAlias() . '.defined_templates_class', $controllerForTemplates);
+                $dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer_controller_for_templates_by_class')));
+            }
         }
         if (!empty($config['route_filters_by_id'])) {
             $matcher = $container->getDefinition('cmf_routing.nested_matcher');