[Router] config fixes

src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml

@@ -8,8 +8,8 @@
         <parameter key="router.class">Symfony\Component\Routing\Router</parameter>
         <parameter key="router.cached.class">Symfony\Bundle\FrameworkBundle\Routing\CachedRouter</parameter>
         <parameter key="routing.loader.class">Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader</parameter>
-        <parameter key="routing.file_locator.class">Symfony\Component\HttpKernel\Config\FileLocator</parameter>
-        <parameter key="routing.resolver.class">Symfony\Component\Routing\Loader\LoaderResolver</parameter>
+        <parameter key="routing.file_locator.class">Symfony\Component\HttpKernel\Config\Loader\FileLocator</parameter>
+        <parameter key="routing.resolver.class">Symfony\Component\Config\Loader\LoaderResolver</parameter>
         <parameter key="routing.loader.xml.class">Symfony\Component\Routing\Loader\XmlFileLoader</parameter>
         <parameter key="routing.loader.yml.class">Symfony\Component\Routing\Loader\YamlFileLoader</parameter>
         <parameter key="routing.loader.php.class">Symfony\Component\Routing\Loader\PhpFileLoader</parameter>

src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php

@@ -12,8 +12,8 @@
 namespace Symfony\Bundle\FrameworkBundle\Routing;
 
 use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser;
-use Symfony\Component\Routing\Loader\DelegatingLoader as BaseDelegatingLoader;
-use Symfony\Component\Routing\Loader\LoaderResolverInterface;
+use Symfony\Component\Config\Loader\DelegatingLoader as BaseDelegatingLoader;
+use Symfony\Component\Config\Loader\LoaderResolverInterface;
 use Symfony\Component\HttpKernel\Log\LoggerInterface;
 
 /**

src/Symfony/Bundle/FrameworkBundle/Routing/LazyLoader.php

@@ -11,9 +11,9 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Routing;
 
-use Symfony\Component\Routing\Loader\LoaderInterface;
+use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\Routing\Loader\LoaderResolver as BaseLoaderResolver;
+use Symfony\Component\Config\Loader\LoaderResolver;
 
 /**
  * LazyLoader facilitate lazy loading of loader services.
@@ -78,7 +78,7 @@ class LazyLoader implements LoaderInterface
      *
      * @param LoaderResolver $resolver A LoaderResolver instance
      */
-    public function setResolver(BaseLoaderResolver $resolver)
+    public function setResolver(LoaderResolver $resolver)
     {
         $this->container->get($this->service)->setResolver($resolver);
     }

src/Symfony/Component/Routing/Router.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Routing;
 
-use Symfony\Component\Routing\Loader\LoaderInterface;
+use Symfony\Component\Config\Loader\LoaderInterface;
 
 /**
  * The Router class is an example of the integration of all pieces of the