Fixed tests after cleanup

Author: wouterj

src/ChainRouter.php

@@ -126,6 +126,10 @@ protected function sortRouters()
     {
         krsort($this->routers);
 
+        if (0 === count($this->routers)) {
+            return array();
+        }
+
         return call_user_func_array('array_merge', $this->routers);
     }
 

src/DynamicRouter.php

@@ -350,6 +350,10 @@ protected function sortRouteEnhancers()
     {
         krsort($this->enhancers);
 
+        if (0 === count($this->enhancers)) {
+            return array();
+        }
+
         return call_user_func_array('array_merge', $this->enhancers);
     }
 

tests/Unit/Candidates/CandidatesTest.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Cmf\Component\Routing\Tests\Candidates;
+namespace Symfony\Cmf\Component\Routing\Tests\Unit\Candidates;
 
 use Symfony\Cmf\Component\Routing\Candidates\Candidates;
 use Symfony\Component\HttpFoundation\Request;

tests/Unit/DependencyInjection/Compiler/RegisterRouteEnhancersPassTest.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Cmf\Component\Routing\Tests\DependencyInjection\Compiler;
+namespace Symfony\Cmf\Component\Routing\Tests\Unit\DependencyInjection\Compiler;
 
 use Symfony\Cmf\Component\Routing\DependencyInjection\Compiler\RegisterRouteEnhancersPass;
 use Symfony\Component\DependencyInjection\Definition;

tests/Unit/DependencyInjection/Compiler/RegisterRoutersPassTest.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Cmf\Routing\Tests\DependencyInjection\Compiler;
+namespace Symfony\Cmf\Routing\Tests\Unit\DependencyInjection\Compiler;
 
 use Symfony\Cmf\Component\Routing\DependencyInjection\Compiler\RegisterRoutersPass;
 use Symfony\Component\DependencyInjection\Reference;

tests/Unit/Enhancer/ConditionalEnhancerTest.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Cmf\Component\Routing\Tests\Mapper;
+namespace Symfony\Cmf\Component\Routing\Tests\Unit\Mapper;
 
 use Symfony\Cmf\Component\Routing\Enhancer\ConditionalEnhancer;
 use Symfony\Component\HttpFoundation\Request;

tests/Unit/Enhancer/ContentRepositoryEnhancerTest.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Cmf\Component\Routing\Tests\Enhancer;
+namespace Symfony\Cmf\Component\Routing\Tests\Unit\Enhancer;
 
 use Symfony\Cmf\Component\Routing\Enhancer\ContentRepositoryEnhancer;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;

tests/Unit/Enhancer/FieldByClassEnhancerTest.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Cmf\Component\Routing\Tests\Enhancer;
+namespace Symfony\Cmf\Component\Routing\Tests\Unit\Enhancer;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Cmf\Component\Routing\Test\CmfUnitTestCase;

tests/Unit/Enhancer/FieldMapEnhancerTest.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Cmf\Component\Routing\Tests\Mapper;
+namespace Symfony\Cmf\Component\Routing\Tests\Unit\Mapper;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Cmf\Component\Routing\Test\CmfUnitTestCase;

tests/Unit/Enhancer/FieldPresenceEnhancerTest.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Cmf\Component\Routing\Tests\Enhancer;
+namespace Symfony\Cmf\Component\Routing\Tests\Unit\Enhancer;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Cmf\Component\Routing\Enhancer\FieldPresenceEnhancer;