Move RoutingResolverPass to the Routing component

Author: chalasr

CHANGELOG.md

@@ -27,8 +27,9 @@ CHANGELOG
    `render()`, `renderView()` and `stream()` methods can only use Twig (using the Templating component is not supported).
    The `json()` method requires the Serializer component (use `Symfony\Component\HttpFoundation\JsonResponse` directly if
    you do not want to use the Serializer).
- * Deprecated `ControllerArgumentValueResolverPass`. Use 
+ * Deprecated `ControllerArgumentValueResolverPass`. Use
    `Symfony\Component\HttpKernel\DependencyInjection\ControllerArgumentValueResolverPass` instead
+ * Deprecated `RoutingResolverPass`, use `Symfony\Component\Routing\DependencyInjection\RoutingResolverPass` instead
 
 3.2.0
 -----

DependencyInjection/Compiler/RoutingResolverPass.php

@@ -11,27 +11,17 @@
 
 namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\Routing\DependencyInjection\RoutingResolverPass as BaseRoutingResolverPass;
+
+@trigger_error(sprintf('The %s class is deprecated since version 3.3 and will be removed in 4.0. Use %s instead.', RoutingResolverPass::class, BaseRoutingResolverPass::class), E_USER_DEPRECATED);
 
 /**
  * Adds tagged routing.loader services to routing.resolver service.
  *
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @deprecated since version 3.3, to be removed in 4.0. Use {@link BaseRoutingResolverPass}
  */
-class RoutingResolverPass implements CompilerPassInterface
+class RoutingResolverPass extends BaseRoutingResolverPass
 {
-    public function process(ContainerBuilder $container)
-    {
-        if (false === $container->hasDefinition('routing.resolver')) {
-            return;
-        }
-
-        $definition = $container->getDefinition('routing.resolver');
-
-        foreach ($container->findTaggedServiceIds('routing.loader') as $id => $attributes) {
-            $definition->addMethodCall('addLoader', array(new Reference($id)));
-        }
-    }
 }

FrameworkBundle.php

@@ -20,7 +20,6 @@
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\CachePoolClearerPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\DataCollectorTranslatorPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TemplatingPass;
-use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\RoutingResolverPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ProfilerPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TranslatorPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\LoggingTranslatorPass;
@@ -37,6 +36,7 @@
 use Symfony\Component\Console\DependencyInjection\AddConsoleCommandPass;
 use Symfony\Component\HttpKernel\DependencyInjection\ControllerArgumentValueResolverPass;
 use Symfony\Component\PropertyInfo\DependencyInjection\PropertyInfoPass;
+use Symfony\Component\Routing\DependencyInjection\RoutingResolverPass;
 use Symfony\Component\Serializer\DependencyInjection\SerializerPass;
 use Symfony\Component\Debug\ErrorHandler;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

composer.json

@@ -27,7 +27,7 @@
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/filesystem": "~2.8|~3.0",
         "symfony/finder": "~2.8|~3.0",
-        "symfony/routing": "~3.1.10|^3.2.3",
+        "symfony/routing": "~3.3",
         "symfony/security-core": "~2.8|~3.0",
         "symfony/security-csrf": "~2.8|~3.0",
         "symfony/stopwatch": "~2.8|~3.0",