Merge pull request #341 from andrey1s/content-enhancer

init content repository enhancer

Author: wouterj

DependencyInjection/CmfRoutingExtension.php

@@ -139,6 +139,8 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
         if ($hasContentRepository) {
             $generator = $container->getDefinition('cmf_routing.generator');
             $generator->addMethodCall('setContentRepository', array(new Reference('cmf_routing.content_repository')));
+            $container->getDefinition('cmf_routing.enhancer.content_repository')
+                      ->addTag('dynamic_router_route_enhancer', array('priority' => 100));
         }
 
         $dynamic = $container->getDefinition('cmf_routing.dynamic_router');

Resources/config/routing-dynamic.xml

@@ -16,6 +16,7 @@
         <parameter key="cmf_routing.enhancer.explicit_template.class">Symfony\Cmf\Component\Routing\Enhancer\FieldPresenceEnhancer</parameter>
         <parameter key="cmf_routing.enhancer.controllers_by_type.class">Symfony\Cmf\Component\Routing\Enhancer\FieldMapEnhancer</parameter>
         <parameter key="cmf_routing.enhancer.field_by_class.class">Symfony\Cmf\Component\Routing\Enhancer\FieldByClassEnhancer</parameter>
+        <parameter key="cmf_routing.enhancer.content_repository.class">Symfony\Cmf\Component\Routing\Enhancer\ContentRepositoryEnhancer</parameter>
         <parameter key="cmf_routing.redirect_controller.class">Symfony\Cmf\Bundle\RoutingBundle\Controller\RedirectController</parameter>
     </parameters>
 
@@ -62,6 +63,10 @@
             <argument>%cmf_routing.templates_by_class%</argument>
         </service>
 
+        <service id="cmf_routing.enhancer.content_repository" class="%cmf_routing.enhancer.content_repository.class%" public="false">
+            <argument type="service" id="cmf_routing.content_repository"/>
+        </service>
+
         <service id="cmf_routing.dynamic_router" class="%cmf_routing.dynamic_router.class%">
             <argument type="service" id="router.request_context"/>
             <argument type="service" id="cmf_routing.nested_matcher" />

Tests/Unit/DependencyInjection/CmfRoutingExtensionTest.php

@@ -87,6 +87,11 @@ public function testLoadConfigured()
             new Reference('router.default'),
             300,
         ));
+        $this->assertContainerBuilderHasServiceDefinitionWithTag(
+            'cmf_routing.enhancer.content_repository',
+            'dynamic_router_route_enhancer',
+            array('priority' => 100)
+        );
     }
 
     public function testWhitespaceInPriorities()
@@ -154,6 +159,11 @@ public function testLoadBasePaths($phpcrConfig, $routeBasepathsParameter, $admin
 
         $this->assertContainerBuilderHasParameter('cmf_routing.dynamic.persistence.phpcr.route_basepaths', $routeBasepathsParameter);
         $this->assertContainerBuilderHasParameter('cmf_routing.dynamic.persistence.phpcr.admin_basepath', $adminBasePathParameter);
+        $this->assertContainerBuilderHasServiceDefinitionWithTag(
+            'cmf_routing.enhancer.content_repository',
+            'dynamic_router_route_enhancer',
+            array('priority' => 100)
+        );
     }
 
     public function getBasePathsTests()
@@ -226,6 +236,11 @@ public function testRouteBasepathsMerging($phpcrConfig1, $phpcrConfig2, $routeBa
 
         $this->assertContainerBuilderHasParameter('cmf_routing.dynamic.persistence.phpcr.route_basepaths', $routeBasepathsParameter);
         $this->assertContainerBuilderHasParameter('cmf_routing.dynamic.persistence.phpcr.admin_basepath', $adminBasePathParameter);
+        $this->assertContainerBuilderHasServiceDefinitionWithTag(
+            'cmf_routing.enhancer.content_repository',
+            'dynamic_router_route_enhancer',
+            array('priority' => 100)
+        );
     }
 
     public function getBasePathsMergingTests()

composer.json

@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": "^5.3.9|^7.0",
-        "symfony-cmf/routing": "~1.2",
+        "symfony-cmf/routing": "^1.4.0-RC3",
         "symfony/framework-bundle": "~2.3"
     },
     "require-dev": {