Cleaned Bundle

BeSimple · Mar 27, 2011 · dad4227 · dad4227
1 parent 0ee8141
commit dad4227
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 67 deletions.
diff --git a/BeSimpleI18nRoutingBundle.php b/BeSimpleI18nRoutingBundle.php
@@ -2,9 +2,9 @@
 
 namespace BeSimple\I18nRoutingBundle;
 
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use BeSimple\I18nRoutingBundle\DependencyInjection\Compiler\OverrideRoutingCompilerPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class BeSimpleI18nRoutingBundle extends Bundle
 {

diff --git a/DependencyInjection/BeSimpleI18nRoutingExtension.php b/DependencyInjection/BeSimpleI18nRoutingExtension.php
@@ -2,10 +2,10 @@
 
 namespace BeSimple\I18nRoutingBundle\DependencyInjection;
 
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\Config\FileLocator;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class BeSimpleI18nRoutingExtension extends Extension
 {

diff --git a/Routing/I18nRoute.php b/Routing/I18nRoute.php
@@ -2,6 +2,7 @@
 
 namespace BeSimple\I18nRoutingBundle\Routing;
 
+use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
 class I18nRoute

diff --git a/Routing/Loader/XmlFileLoader.php b/Routing/Loader/XmlFileLoader.php
@@ -2,9 +2,10 @@
 
 namespace BeSimple\I18nRoutingBundle\Routing\Loader;
 
+use BeSimple\I18nRoutingBundle\Routing\I18nRoute;
 use Symfony\Component\Routing\Loader\XmlFileLoader as BaseXmlFileLoader;
+use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
-use BeSimple\I18nRoutingBundle\Routing;
 
 class XmlFileLoader extends BaseXmlFileLoader
 {
@@ -48,11 +49,11 @@ protected function parseRoute(RouteCollection $collection, \DOMElement $definiti
         }
 
         if ($locales) {
-            $route = new Routing\I18nRoute((string) $definition->getAttribute('id'), $locales, $defaults, $requirements, $options);
+            $route = new I18nRoute((string) $definition->getAttribute('id'), $locales, $defaults, $requirements, $options);
 
             $collection->addCollection($route->getCollection());
         } else {
-            $route = new Routing\Route((string) $definition->getAttribute('pattern'), $defaults, $requirements, $options);
+            $route = new Route((string) $definition->getAttribute('pattern'), $defaults, $requirements, $options);
 
             $collection->add((string) $definition->getAttribute('id'), $route);
         }

diff --git a/Routing/Loader/YamlFileLoader.php b/Routing/Loader/YamlFileLoader.php
@@ -3,9 +3,9 @@
 namespace BeSimple\I18nRoutingBundle\Routing\Loader;
 
 use BeSimple\I18nRoutingBundle\Routing\I18nRoute;
-use BeSimple\I18nRoutingBundle\Routing\Route;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Routing\Loader\YamlFileLoader as BaseYamlFileLoader;
+use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Yaml\Yaml;
 

diff --git a/Routing/Route.php b/Routing/Route.php
diff --git a/Routing/Router.php b/Routing/Router.php
@@ -2,9 +2,9 @@
 
 namespace BeSimple\I18nRoutingBundle\Routing;
 
-use Symfony\Component\Routing\Router as BaseRouter;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\HttpFoundation\Session;
+use Symfony\Component\Routing\Router as BaseRouter;
 
 class Router extends BaseRouter
 {