enable more styleci checks

.styleci.yml

@@ -1 +1,5 @@
 preset: symfony
+
+enabled:
+  - ordered_use
+  - short_array_syntax

README.md

@@ -24,7 +24,8 @@ and licensed under the [MIT License](LICENSE).
 
 ## Requirements
 
-* The Symfony Routing component (>= 2.2.0)
+* PHP 5.6 / 7
+* The Symfony Routing component (2.2.0 - 3.\*)
 * See also the `require` section of [composer.json](composer.json)
 
 

src/ChainRouter.php

@@ -11,18 +11,18 @@
 
 namespace Symfony\Cmf\Component\Routing;
 
-use Symfony\Component\Routing\RouterInterface;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface;
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RequestContextAwareInterface;
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Routing\Exception\RouteNotFoundException;
-use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface;
-use Psr\Log\LoggerInterface;
+use Symfony\Component\Routing\RouterInterface;
 
 /**
  * The ChainRouter allows to combine several routers to try in a defined order.

src/ChainRouterInterface.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\Cmf\Component\Routing;
 
-use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
+use Symfony\Component\Routing\RouterInterface;
 
 /**
  * Interface for a router that proxies routing to other routers.

src/ContentAwareGenerator.php

@@ -12,9 +12,9 @@
 namespace Symfony\Cmf\Component\Routing;
 
 use Doctrine\Common\Collections\Collection;
+use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\Route as SymfonyRoute;
-use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\Component\Routing\RouteCollection;
 
 /**

src/DependencyInjection/Compiler/RegisterRouteEnhancersPass.php

@@ -11,9 +11,9 @@
 
 namespace Symfony\Cmf\Component\Routing\DependencyInjection\Compiler;
 
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 
 /**
  * This compiler pass adds additional route enhancers

src/DependencyInjection/Compiler/RegisterRoutersPass.php

@@ -11,9 +11,9 @@
 
 namespace Symfony\Cmf\Component\Routing\DependencyInjection\Compiler;
 
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 
 /**
  * Compiler pass to register routers to the ChainRouter.

src/DynamicRouter.php

@@ -11,23 +11,23 @@
 
 namespace Symfony\Cmf\Component\Routing;
 
+use Symfony\Cmf\Component\Routing\Enhancer\RouteEnhancerInterface;
+use Symfony\Cmf\Component\Routing\Event\Events;
+use Symfony\Cmf\Component\Routing\Event\RouterGenerateEvent;
+use Symfony\Cmf\Component\Routing\Event\RouterMatchEvent;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\RequestContext;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
 use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
+use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RequestContextAwareInterface;
-use Symfony\Component\Routing\Exception\RouteNotFoundException;
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Routing\Exception\MethodNotAllowedException;
-use Symfony\Cmf\Component\Routing\Enhancer\RouteEnhancerInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Cmf\Component\Routing\Event\Events;
-use Symfony\Cmf\Component\Routing\Event\RouterMatchEvent;
-use Symfony\Cmf\Component\Routing\Event\RouterGenerateEvent;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+use Symfony\Component\Routing\RouterInterface;
 
 /**
  * A flexible router accepting matcher and generator through injection and

src/Enhancer/RouteContentEnhancer.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\Cmf\Component\Routing\Enhancer;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * This enhancer sets the content to target field if the route provides content.

src/LazyRouteCollection.php

@@ -12,8 +12,8 @@
 namespace Symfony\Cmf\Component\Routing;
 
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
-use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
 
 class LazyRouteCollection extends RouteCollection
 {

src/NestedMatcher/NestedMatcher.php

@@ -11,10 +11,10 @@
 
 namespace Symfony\Cmf\Component\Routing\NestedMatcher;
 
+use Symfony\Cmf\Component\Routing\RouteProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
-use Symfony\Cmf\Component\Routing\RouteProviderInterface;
 
 /**
  * A more flexible approach to matching. The route collection to match against

src/NestedMatcher/RouteFilterInterface.php

@@ -11,9 +11,9 @@
 
 namespace Symfony\Cmf\Component\Routing\NestedMatcher;
 
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\RouteCollection;
 
 /**
  * A RouteFilter takes a RouteCollection and returns a filtered subset.

src/NestedMatcher/UrlMatcher.php

@@ -11,12 +11,12 @@
 
 namespace Symfony\Cmf\Component\Routing\NestedMatcher;
 
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Matcher\UrlMatcher as SymfonyUrlMatcher;
+use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Matcher\UrlMatcher as SymfonyUrlMatcher;
 use Symfony\Component\Routing\RequestContext;
-use Symfony\Cmf\Component\Routing\RouteObjectInterface;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
 
 /**
  * Extended UrlMatcher to provide an additional interface and enhanced features.

src/ProviderBasedGenerator.php

@@ -11,11 +11,11 @@
 
 namespace Symfony\Cmf\Component\Routing;
 
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\Component\Routing\Generator\UrlGenerator;
-use Symfony\Component\Routing\Route as SymfonyRoute;
 use Symfony\Component\Routing\RequestContext;
-use Symfony\Component\Routing\Exception\RouteNotFoundException;
-use Psr\Log\LoggerInterface;
+use Symfony\Component\Routing\Route as SymfonyRoute;
 
 /**
  * A Generator that uses a RouteProvider rather than a RouteCollection.

tests/Unit/Enhancer/FieldByClassEnhancerTest.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Unit\Enhancer;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Cmf\Component\Routing\Enhancer\FieldByClassEnhancer;
+use Symfony\Component\HttpFoundation\Request;
 
 class FieldByClassEnhancerTest extends \PHPUnit_Framework_TestCase
 {

tests/Unit/Enhancer/FieldMapEnhancerTest.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Unit\Mapper;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Cmf\Component\Routing\Enhancer\FieldMapEnhancer;
+use Symfony\Component\HttpFoundation\Request;
 
 class FieldMapEnhancerTest extends \PHPUnit_Framework_TestCase
 {

tests/Unit/Enhancer/FieldPresenceEnhancerTest.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Unit\Enhancer;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Cmf\Component\Routing\Enhancer\FieldPresenceEnhancer;
+use Symfony\Component\HttpFoundation\Request;
 
 class FieldPresenceEnhancerTest extends \PHPUnit_Framework_TestCase
 {

tests/Unit/Enhancer/RouteContentEnhancerTest.php

@@ -11,9 +11,9 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Unit\Enhancer;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Cmf\Component\Routing\Enhancer\RouteContentEnhancer;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 
 class RouteContentEnhancerTest extends \PHPUnit_Framework_TestCase

tests/Unit/Enhancer/RouteObject.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Unit\Enhancer;
 
-use Symfony\Component\Routing\Route;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
+use Symfony\Component\Routing\Route;
 
 /**
  * Empty abstract class to be able to mock an object that both extends Route

tests/Unit/NestedMatcher/NestedMatcherTest.php

@@ -12,13 +12,13 @@
 namespace Symfony\Cmf\Component\Routing\Tests\Unit\NestedMatcher;
 
 use Symfony\Cmf\Component\Routing\NestedMatcher\FinalMatcherInterface;
+use Symfony\Cmf\Component\Routing\NestedMatcher\NestedMatcher;
 use Symfony\Cmf\Component\Routing\NestedMatcher\RouteFilterInterface;
 use Symfony\Cmf\Component\Routing\RouteProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Cmf\Component\Routing\NestedMatcher\NestedMatcher;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
 
 class NestedMatcherTest extends \PHPUnit_Framework_TestCase
 {

tests/Unit/NestedMatcher/UrlMatcherTest.php

@@ -11,14 +11,14 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Unit\NestedMatcher;
 
+use Symfony\Cmf\Component\Routing\NestedMatcher\UrlMatcher;
+use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Cmf\Component\Routing\Tests\Unit\Routing\RouteMock;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\CompiledRoute;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
-use Symfony\Cmf\Component\Routing\NestedMatcher\UrlMatcher;
-use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 
 class UrlMatcherTest extends \PHPUnit_Framework_TestCase
 {

tests/Unit/Routing/ChainRouterTest.php

@@ -12,19 +12,19 @@
 namespace Symfony\Cmf\Component\Routing\Tests\Routing;
 
 use Psr\Log\LoggerInterface;
+use Symfony\Cmf\Component\Routing\ChainRouter;
 use Symfony\Cmf\Component\Routing\VersatileGeneratorInterface;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
 use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Cmf\Component\Routing\ChainRouter;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Routing\Route;
 
 class ChainRouterTest extends \PHPUnit_Framework_TestCase
 {

tests/Unit/Routing/ContentAwareGeneratorTest.php

@@ -11,13 +11,13 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Routing;
 
+use Symfony\Cmf\Component\Routing\ContentAwareGenerator;
+use Symfony\Cmf\Component\Routing\ContentRepositoryInterface;
 use Symfony\Cmf\Component\Routing\RouteProviderInterface;
 use Symfony\Cmf\Component\Routing\RouteReferrersReadInterface;
-use Symfony\Cmf\Component\Routing\ContentAwareGenerator;
 use Symfony\Cmf\Component\Routing\Tests\Unit\Routing\RouteMock;
 use Symfony\Component\Routing\CompiledRoute;
 use Symfony\Component\Routing\RequestContext;
-use Symfony\Cmf\Component\Routing\ContentRepositoryInterface;
 use Symfony\Component\Routing\Route;
 
 class ContentAwareGeneratorTest extends \PHPUnit_Framework_TestCase

tests/Unit/Routing/DynamicRouterTest.php

@@ -11,8 +11,10 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Routing;
 
+use Symfony\Cmf\Component\Routing\DynamicRouter;
 use Symfony\Cmf\Component\Routing\Enhancer\RouteEnhancerInterface;
 use Symfony\Cmf\Component\Routing\Event\Events;
+use Symfony\Cmf\Component\Routing\Event\RouterGenerateEvent;
 use Symfony\Cmf\Component\Routing\Event\RouterMatchEvent;
 use Symfony\Cmf\Component\Routing\LazyRouteCollection;
 use Symfony\Cmf\Component\Routing\RouteProviderInterface;
@@ -21,12 +23,10 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Cmf\Component\Routing\DynamicRouter;
 use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
 use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RouteCollection;
-use Symfony\Cmf\Component\Routing\Event\RouterGenerateEvent;
 
 class DynamicRouterTest extends \PHPUnit_Framework_TestCase
 {

tests/Unit/Routing/ProviderBasedGeneratorTest.php

@@ -11,12 +11,12 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Routing;
 
-use Symfony\Cmf\Component\Routing\RouteObjectInterface;
-use Symfony\Component\Routing\RequestContext;
-use Symfony\Component\Routing\Route;
 use Symfony\Cmf\Component\Routing\ProviderBasedGenerator;
+use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Cmf\Component\Routing\RouteProviderInterface;
 use Symfony\Component\Routing\CompiledRoute;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\Route;
 
 class ProviderBasedGeneratorTest extends \PHPUnit_Framework_TestCase
 {

tests/Unit/Routing/RouteMock.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\Cmf\Component\Routing\Tests\Unit\Routing;
 
-use Symfony\Component\Routing\Route as SymfonyRoute;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
+use Symfony\Component\Routing\Route as SymfonyRoute;
 
 class RouteMock extends SymfonyRoute implements RouteObjectInterface
 {