Merge pull request #120 from symfony-cmf/remove_compiler

move chain router and enhancer compiler passes to component, adjust DI

Author: dbu

CmfRoutingBundle.php

@@ -6,8 +6,8 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Cmf\Bundle\RoutingBundle\DependencyInjection\Compiler\ChainRouterPass;
-use Symfony\Cmf\Bundle\RoutingBundle\DependencyInjection\Compiler\RouteEnhancerPass;
+use Symfony\Cmf\Component\Routing\DependencyInjection\Compiler\RegisterRoutersPass;
+use Symfony\Cmf\Component\Routing\DependencyInjection\Compiler\RegisterRouteEnhancersPass;
 use Symfony\Cmf\Bundle\RoutingBundle\DependencyInjection\Compiler\SetRouterPass;
 
 /**
@@ -21,8 +21,8 @@ class CmfRoutingBundle extends Bundle
     public function build(ContainerBuilder $container)
     {
         parent::build($container);
-        $container->addCompilerPass(new ChainRouterPass());
-        $container->addCompilerPass(new RouteEnhancerPass());
+        $container->addCompilerPass(new RegisterRoutersPass());
+        $container->addCompilerPass(new RegisterRouteEnhancersPass());
         $container->addCompilerPass(new SetRouterPass());
 
         if (class_exists('Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass')) {

DependencyInjection/Compiler/ChainRouterPass.php

@@ -65,7 +65,7 @@
 
         <service id="cmf_routing.nested_matcher" class="%cmf_routing.nested_matcher_class%">
             <argument type="service" id="cmf_routing.route_provider" />
-            <call method="setFinalMatcher"><argument type="service" id="cmf_routing.final_matcher"/></call>
+            <argument type="service" id="cmf_routing.final_matcher"/>
         </service>
 
         <service id="cmf_routing.final_matcher" class="%cmf_routing.final_matcher_class%">

DependencyInjection/Compiler/RouteEnhancerPass.php

@@ -14,7 +14,7 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.3.3",
-        "symfony-cmf/routing": "~1.1.0-dev",
+        "symfony-cmf/routing": "~1.1.0-beta2",
         "symfony/framework-bundle": "~2.2"
     },
     "require-dev": {