Fixed tests after cleanup

symfony-cmf · Jan 5, 2017 · 0aa8838 · 0aa8838
1 parent 2324474
commit 0aa8838
Show file tree

Hide file tree

Showing 18 changed files with 32 additions and 30 deletions.
diff --git a/src/ChainRouter.php b/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);
     }
 

diff --git a/src/DynamicRouter.php b/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);
     }
 

diff --git a/tests/Unit/Candidates/CandidatesTest.php b/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;

diff --git a/tests/Unit/DependencyInjection/Compiler/RegisterRouteEnhancersPassTest.php b/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;

diff --git a/tests/Unit/DependencyInjection/Compiler/RegisterRoutersPassTest.php b/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;

diff --git a/tests/Unit/Enhancer/ConditionalEnhancerTest.php b/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;

diff --git a/tests/Unit/Enhancer/ContentRepositoryEnhancerTest.php b/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;

diff --git a/tests/Unit/Enhancer/FieldByClassEnhancerTest.php b/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;

diff --git a/tests/Unit/Enhancer/FieldMapEnhancerTest.php b/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;

diff --git a/tests/Unit/Enhancer/FieldPresenceEnhancerTest.php b/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;

diff --git a/tests/Unit/Enhancer/RouteContentEnhancerTest.php b/tests/Unit/Enhancer/RouteContentEnhancerTest.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\RouteContentEnhancer;
@@ -27,7 +27,7 @@ class RouteContentEnhancerTest extends CmfUnitTestCase
 
     public function setUp()
     {
-        $this->document = $this->buildMock('Symfony\Cmf\Component\Routing\Tests\Enhancer\RouteObject',
+        $this->document = $this->buildMock('Symfony\Cmf\Component\Routing\Tests\Unit\Enhancer\RouteObject',
                                             array('getContent', 'getRouteDefaults', 'getUrl'));
 
         $this->mapper = new RouteContentEnhancer(RouteObjectInterface::ROUTE_OBJECT, '_content');

diff --git a/tests/Unit/Enhancer/RouteObject.php b/tests/Unit/Enhancer/RouteObject.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\Routing\Route;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;

diff --git a/tests/Unit/NestedMatcher/NestedMatcherTest.php b/tests/Unit/NestedMatcher/NestedMatcherTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Cmf\Component\Routing\Tests\NestedMatcher;
+namespace Symfony\Cmf\Component\Routing\Tests\Unit\NestedMatcher;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\RouteCollection;

diff --git a/tests/Unit/NestedMatcher/UrlMatcherTest.php b/tests/Unit/NestedMatcher/UrlMatcherTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Cmf\Component\Routing\Tests\NestedMatcher;
+namespace Symfony\Cmf\Component\Routing\Tests\Unit\NestedMatcher;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\RouteCollection;
@@ -29,7 +29,7 @@ class UrlMatcherTest extends CmfUnitTestCase
 
     public function setUp()
     {
-        $this->routeDocument = $this->buildMock('Symfony\Cmf\Component\Routing\Tests\Routing\RouteMock', array('getDefaults', 'getRouteKey', 'compile'));
+        $this->routeDocument = $this->buildMock('Symfony\Cmf\Component\Routing\Tests\Unit\Routing\RouteMock', array('getDefaults', 'getRouteKey', 'compile'));
         $this->routeCompiled = $this->buildMock('Symfony\Component\Routing\CompiledRoute');
 
         $this->context = $this->buildMock('Symfony\Component\Routing\RequestContext');
@@ -112,9 +112,6 @@ public function testMatchNoRouteObject()
             ->method('compile')
             ->will($this->returnValue($this->routeCompiled))
         ;
-        $this->routeDocument->expects($this->never())
-            ->method('getRouteKey')
-        ;
         $this->routeDocument->expects($this->atLeastOnce())
             ->method('getDefaults')
             ->will($this->returnValue(array('foo' => 'bar')))

diff --git a/tests/Unit/Routing/ChainRouterTest.php b/tests/Unit/Routing/ChainRouterTest.php
@@ -698,10 +698,6 @@ public function testWarmup()
         $dir = 'test_dir';
         list($low) = $this->createRouterMocks();
 
-        $low
-            ->expects($this->never())
-            ->method('warmUp')
-        ;
         $high = $this->getMock('Symfony\Cmf\Component\Routing\Tests\Routing\WarmableRouterMock');
         $high
             ->expects($this->once())

diff --git a/tests/Unit/Routing/ContentAwareGeneratorTest.php b/tests/Unit/Routing/ContentAwareGeneratorTest.php
@@ -14,6 +14,7 @@
 use Symfony\Cmf\Component\Routing\RouteReferrersReadInterface;
 use Symfony\Cmf\Component\Routing\ContentAwareGenerator;
 use Symfony\Cmf\Component\Routing\Test\CmfUnitTestCase;
+use Symfony\Cmf\Component\Routing\Tests\Unit\Routing\RouteMock;
 
 class ContentAwareGeneratorTest extends CmfUnitTestCase
 {
@@ -31,7 +32,7 @@ class ContentAwareGeneratorTest extends CmfUnitTestCase
     public function setUp()
     {
         $this->contentDocument = $this->buildMock('Symfony\Cmf\Component\Routing\RouteReferrersReadInterface');
-        $this->routeDocument = $this->buildMock('Symfony\Cmf\Component\Routing\Tests\Routing\RouteMock', array('getDefaults', 'compile'));
+        $this->routeDocument = $this->buildMock(RouteMock::class, array('getDefaults', 'compile'));
         $this->routeCompiled = $this->buildMock('Symfony\Component\Routing\CompiledRoute');
         $this->provider = $this->buildMock('Symfony\Cmf\Component\Routing\RouteProviderInterface');
         $this->context = $this->buildMock('Symfony\Component\Routing\RequestContext');
@@ -104,7 +105,7 @@ public function testGenerateEmptyRouteString()
 
     public function testGenerateRouteMultilang()
     {
-        $route_en = $this->buildMock('Symfony\Cmf\Component\Routing\Tests\Routing\RouteMock', array('getDefaults', 'compile', 'getContent'));
+        $route_en = $this->buildMock(RouteMock::class, array('getDefaults', 'compile', 'getContent'));
         $route_en->setLocale('en');
         $route_de = $this->routeDocument;
         $route_de->setLocale('de');
@@ -130,7 +131,7 @@ public function testGenerateRouteMultilang()
 
     public function testGenerateRouteMultilangDefaultLocale()
     {
-        $route = $this->buildMock('Symfony\Cmf\Component\Routing\Tests\Routing\RouteMock');
+        $route = $this->buildMock(RouteMock::class);
         $route->expects($this->any())
             ->method('compile')
             ->will($this->returnValue($this->routeCompiled))
@@ -155,7 +156,7 @@ public function testGenerateRouteMultilangDefaultLocale()
 
     public function testGenerateRouteMultilangLocaleNomatch()
     {
-        $route_en = $this->buildMock('Symfony\Cmf\Component\Routing\Tests\Routing\RouteMock', array('getDefaults', 'compile', 'getContent'));
+        $route_en = $this->buildMock(RouteMock::class, array('getDefaults', 'compile', 'getContent'));
         $route_en->setLocale('en');
         $route_de = $this->routeDocument;
         $route_de->setLocale('de');
@@ -194,7 +195,7 @@ public function testGenerateNoncmfRouteMultilang()
     public function testGenerateRoutenameMultilang()
     {
         $name = 'foo/bar';
-        $route_en = $this->buildMock('Symfony\Cmf\Component\Routing\Tests\Routing\RouteMock', array('getDefaults', 'compile', 'getContent'));
+        $route_en = $this->buildMock(RouteMock::class, array('getDefaults', 'compile', 'getContent'));
         $route_en->setLocale('en');
         $route_de = $this->routeDocument;
         $route_de->setLocale('de');
@@ -241,7 +242,7 @@ public function testGenerateRoutenameMultilangNotFound()
 
     public function testGenerateDocumentMultilang()
     {
-        $route_en = $this->buildMock('Symfony\Cmf\Component\Routing\Tests\Routing\RouteMock', array('getDefaults', 'compile'));
+        $route_en = $this->buildMock(RouteMock::class, array('getDefaults', 'compile'));
         $route_en->setLocale('en');
         $route_de = $this->routeDocument;
         $route_de->setLocale('de');
@@ -263,7 +264,7 @@ public function testGenerateDocumentMultilang()
 
     public function testGenerateDocumentMultilangLocaleNomatch()
     {
-        $route_en = $this->buildMock('Symfony\Cmf\Component\Routing\Tests\Routing\RouteMock', array('getDefaults', 'compile'));
+        $route_en = $this->buildMock(RouteMock::class, array('getDefaults', 'compile'));
         $route_en->setLocale('en');
         $route_de = $this->routeDocument;
         $route_de->setLocale('de');

diff --git a/tests/Unit/Routing/DynamicRouterTest.php b/tests/Unit/Routing/DynamicRouterTest.php
@@ -33,7 +33,7 @@ class DynamicRouterTest extends CmfUnitTestCase
 
     public function setUp()
     {
-        $this->routeDocument = $this->buildMock('Symfony\Cmf\Component\Routing\Tests\Routing\RouteMock', array('getDefaults'));
+        $this->routeDocument = $this->buildMock('Symfony\Cmf\Component\Routing\Tests\Unit\Routing\RouteMock', array('getDefaults'));
 
         $this->matcher = $this->buildMock('Symfony\Component\Routing\Matcher\UrlMatcherInterface');
         $this->generator = $this->buildMock('Symfony\Cmf\Component\Routing\VersatileGeneratorInterface', array('supports', 'generate', 'setContext', 'getContext', 'getRouteDebugMessage'));

diff --git a/tests/Unit/Routing/RouteMock.php b/tests/Unit/Routing/RouteMock.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Cmf\Component\Routing\Tests\Routing;
+namespace Symfony\Cmf\Component\Routing\Tests\Unit\Routing;
 
 use Symfony\Component\Routing\Route as SymfonyRoute;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;