Merge pull request #173 from symfony-cmf/cleanup_enhancers

make enhancer services private

Author: dbu

DependencyInjection/CmfRoutingExtension.php

@@ -2,14 +2,14 @@
 
 namespace Symfony\Cmf\Bundle\RoutingBundle\DependencyInjection;
 
-use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Definition\Processor;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 
 /**
  * @author Philippo de Santis
@@ -144,13 +144,12 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
                 foreach ($config['templates_by_class'] as $key => $value) {
                     $controllerForTemplates[$key] = $config['generic_controller'];
                 }
-                $container->setParameter($this->getAlias() . '.defined_templates_class', $controllerForTemplates);
+
+                $definition = $container->getDefinition($this->getAlias() . '.enhancer_controller_for_templates_by_class');
+                $definition->replaceArgument(2, $controllerForTemplates);
+
                 $dynamic->addMethodCall('addRouteEnhancer', array(new Reference($this->getAlias() . '.enhancer_controller_for_templates_by_class')));
-            } else {
-                $container->removeDefinition($this->getAlias() . '.enhancer_controller_for_templates_by_class');
             }
-        } else {
-            $container->removeDefinition($this->getAlias() . '.enhancer_controller_for_templates_by_class');
         }
 
         if (!empty($config['route_filters_by_id'])) {

Resources/config/routing-dynamic.xml

@@ -19,32 +19,32 @@
     </parameters>
 
     <services>
-
         <service id="cmf_routing.enhancer_route_content" class="%cmf_routing.enhancer_route_content_class%">
             <argument>_route_object</argument>
             <argument>_content</argument>
         </service>
-        <service id="cmf_routing.enhancer_explicit_template" class="%cmf_routing.enhancer_explicit_template_class%">
+
+        <service id="cmf_routing.enhancer_explicit_template" class="%cmf_routing.enhancer_explicit_template_class%" public="false">
             <argument>_template</argument>
             <argument>_controller</argument>
             <argument>%cmf_routing.generic_controller%</argument>
         </service>
-        <service id="cmf_routing.enhancer_controllers_by_type" class="%cmf_routing.enhancer_controllers_by_type_class%">
+        <service id="cmf_routing.enhancer_controllers_by_type" class="%cmf_routing.enhancer_controllers_by_type_class%" public="false">
             <argument>type</argument>
             <argument>_controller</argument>
             <argument>%cmf_routing.controllers_by_type%</argument>
         </service>
-        <service id="cmf_routing.enhancer_controllers_by_class" class="%cmf_routing.enhancer_field_by_class_class%">
+        <service id="cmf_routing.enhancer_controllers_by_class" class="%cmf_routing.enhancer_field_by_class_class%" public="false">
             <argument>_content</argument>
             <argument>_controller</argument>
             <argument>%cmf_routing.controllers_by_class%</argument>
         </service>
-        <service id="cmf_routing.enhancer_controller_for_templates_by_class" class="%cmf_routing.enhancer_field_by_class_class%">
+        <service id="cmf_routing.enhancer_controller_for_templates_by_class" class="%cmf_routing.enhancer_field_by_class_class%" public="false">
             <argument>_content</argument>
             <argument>_controller</argument>
-            <argument>%cmf_routing.defined_templates_class%</argument>
+            <argument type="collection" />
         </service>
-        <service id="cmf_routing.enhancer_templates_by_class" class="%cmf_routing.enhancer_field_by_class_class%">
+        <service id="cmf_routing.enhancer_templates_by_class" class="%cmf_routing.enhancer_field_by_class_class%" public="false">
             <argument>_content</argument>
             <argument>_template</argument>
             <argument>%cmf_routing.templates_by_class%</argument>