Tests

AlexejKossmann · Jul 9, 2020 · 4dd724a · 4dd724a
1 parent f11ab17
commit 4dd724a
Show file tree

Hide file tree

Showing 8 changed files with 591 additions and 163 deletions.
diff --git a/core-bundle/src/Resources/config/routing.yml b/core-bundle/src/Resources/config/routing.yml
@@ -4,8 +4,8 @@ services:
 
     Contao\CoreBundle\Routing\Content\ArticleRouteProvider:
         arguments:
-            - '@Contao\CoreBundle\Routing\Page\PageRouteFactory'
+            - '@Contao\CoreBundle\Routing\RouteFactory'
 
     Contao\CoreBundle\Routing\Content\PageRouteProvider:
         arguments:
-            - '@Contao\CoreBundle\Routing\Page\PageRouteFactory'
+            - '@Contao\CoreBundle\Routing\RouteFactory'
diff --git a/core-bundle/src/Routing/Page/PageRegistry.php b/core-bundle/src/Routing/Page/PageRegistry.php
@@ -32,14 +32,9 @@ class PageRegistry
      */
     private $compositionAware = [];
 
-    public function hasRouteConfig(string $type): bool
+    public function getRouteConfig(string $type): RouteConfig
     {
-        return isset($this->routeConfigs[$type]);
-    }
-
-    public function getRouteConfig(string $type): ?RouteConfig
-    {
-        return $this->routeConfigs[$type] ?? null;
+        return $this->routeConfigs[$type] ?? new RouteConfig();
     }
 
     public function enhancePageRoute(PageRoute $route): Route

diff --git a/core-bundle/src/Routing/RouteFactory.php b/core-bundle/src/Routing/RouteFactory.php
@@ -16,7 +16,6 @@
 use Contao\CoreBundle\Routing\Content\ContentRouteProviderInterface;
 use Contao\CoreBundle\Routing\Page\PageRegistry;
 use Contao\CoreBundle\Routing\Page\PageRoute;
-use Contao\CoreBundle\Routing\Page\RouteConfig;
 use Contao\PageModel;
 use Symfony\Component\Routing\Route;
 
@@ -51,7 +50,7 @@ public function __construct(PageRegistry $pageRegistry, iterable $routeProviders
      */
     public function createRouteForPage(PageModel $pageModel, string $defaultParameters = '', $content = null): Route
     {
-        $config = $this->pageRegistry->getRouteConfig($pageModel->type) ?: new RouteConfig();
+        $config = $this->pageRegistry->getRouteConfig($pageModel->type);
         $pathParameters = $config->getPathParameters();
         $defaults = $config->getDefault();
         $requirements = $config->getRequirements();

diff --git a/core-bundle/tests/DependencyInjection/ContaoCoreExtensionTest.php b/core-bundle/tests/DependencyInjection/ContaoCoreExtensionTest.php
@@ -151,7 +151,6 @@
 use Symfony\Cmf\Component\Routing\DynamicRouter;
 use Symfony\Cmf\Component\Routing\NestedMatcher\NestedMatcher;
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
@@ -2823,7 +2822,7 @@ public function testRegistersTheRoutingRouteGenerator(): void
 
         $this->assertEquals(
             [
-                new TaggedIteratorArgument('contao.content_route_provider'),
+                new Reference(RouteFactory::class),
                 new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE),
             ],
             $definition->getArguments()

diff --git a/core-bundle/tests/Routing/ContentResolvingGeneratorTest.php b/core-bundle/tests/Routing/ContentResolvingGeneratorTest.php
@@ -13,26 +13,20 @@
 namespace Contao\CoreBundle\Tests\Routing;
 
 use Contao\CoreBundle\Exception\ContentRouteNotFoundException;
-use Contao\CoreBundle\Routing\Content\ContentRouteProviderInterface;
 use Contao\CoreBundle\Routing\ContentResolvingGenerator;
 use Contao\CoreBundle\Routing\Page\PageRoute;
+use Contao\CoreBundle\Routing\RouteFactory;
 use Contao\CoreBundle\Tests\TestCase;
 use Contao\PageModel;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Routing\Route;
 
 class ContentResolvingGeneratorTest extends TestCase
 {
     /**
-     * @var ContentRouteProviderInterface&MockObject
+     * @var RouteFactory&MockObject
      */
-    private $provider1;
-
-    /**
-     * @var ContentRouteProviderInterface&MockObject
-     */
-    private $provider2;
+    private $routeFactory;
 
     /**
      * @var ContentResolvingGenerator
@@ -41,10 +35,9 @@ class ContentResolvingGeneratorTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->provider1 = $this->createMock(ContentRouteProviderInterface::class);
-        $this->provider2 = $this->createMock(ContentRouteProviderInterface::class);
+        $this->routeFactory = $this->createMock(RouteFactory::class);
 
-        $this->generator = new ContentResolvingGenerator([$this->provider1, $this->provider2]);
+        $this->generator = new ContentResolvingGenerator($this->routeFactory);
     }
 
     public function testThrowsExceptionIfRouteNameIsNotSupported(): void
@@ -61,113 +54,6 @@ public function testThrowsExceptionIfContentParameterIsNotSet(): void
         $this->generator->generate(PageRoute::ROUTE_NAME);
     }
 
-    public function testGeneratesTheContentObjectWithoutResolvingIfItIsARoute(): void
-    {
-        $content = new Route('/foobar');
-
-        $url = $this->generator->generate(
-            PageRoute::ROUTE_NAME,
-            [PageRoute::CONTENT_PARAMETER => $content]
-        );
-
-        $this->assertSame('/foobar', $url);
-    }
-
-    public function testUsesTheFirstResolverThatSupportsTheContent(): void
-    {
-        $content = (object) ['foo' => 'bar'];
-
-        $this->provider1
-            ->expects($this->once())
-            ->method('supportsContent')
-            ->with($content)
-            ->willReturn(true)
-        ;
-
-        $this->provider1
-            ->expects($this->once())
-            ->method('getRouteForContent')
-            ->with($content)
-            ->willReturn(new Route('/foobar'))
-        ;
-
-        $this->provider2
-            ->expects($this->never())
-            ->method($this->anything())
-        ;
-
-        $url = $this->generator->generate(
-            PageRoute::ROUTE_NAME,
-            [PageRoute::CONTENT_PARAMETER => $content]
-        );
-
-        $this->assertSame('/foobar', $url);
-    }
-
-    public function testIteratesOverTheResolvers(): void
-    {
-        $content = (object) ['foo' => 'bar'];
-
-        $this->provider1
-            ->expects($this->once())
-            ->method('supportsContent')
-            ->with($content)
-            ->willReturn(false)
-        ;
-
-        $this->provider1
-            ->expects($this->never())
-            ->method('getRouteForContent')
-        ;
-
-        $this->provider2
-            ->expects($this->once())
-            ->method('supportsContent')
-            ->with($content)
-            ->willReturn(true)
-        ;
-
-        $this->provider2
-            ->expects($this->once())
-            ->method('getRouteForContent')
-            ->with($content)
-            ->willReturn(new Route('/foobar'))
-        ;
-
-        $url = $this->generator->generate(
-            PageRoute::ROUTE_NAME,
-            [PageRoute::CONTENT_PARAMETER => $content]
-        );
-
-        $this->assertSame('/foobar', $url);
-    }
-
-    public function testThrowsExceptionIfNoResolverSupportsTheContent(): void
-    {
-        $content = (object) ['foo' => 'bar'];
-
-        $this->provider1
-            ->expects($this->once())
-            ->method('supportsContent')
-            ->with($content)
-            ->willReturn(false)
-        ;
-
-        $this->provider2
-            ->expects($this->once())
-            ->method('supportsContent')
-            ->with($content)
-            ->willReturn(false)
-        ;
-
-        $this->expectException(ContentRouteNotFoundException::class);
-
-        $this->generator->generate(
-            PageRoute::ROUTE_NAME,
-            [PageRoute::CONTENT_PARAMETER => $content]
-        );
-    }
-
     public function testGeneratesTheContentRoute(): void
     {
         $content = (object) ['foo' => 'bar'];
@@ -185,25 +71,13 @@ public function testGeneratesTheContentRoute(): void
 
         $route = new PageRoute($page);
 
-        $this->provider1
+        $this->routeFactory
             ->expects($this->once())
-            ->method('supportsContent')
-            ->with($content)
-            ->willReturn(true)
-        ;
-
-        $this->provider1
-            ->expects($this->once())
-            ->method('getRouteForContent')
+            ->method('createRouteForContent')
             ->with($content)
             ->willReturn($route)
         ;
 
-        $this->provider2
-            ->expects($this->never())
-            ->method($this->anything())
-        ;
-
         $url = $this->generator->generate(
             PageRoute::ROUTE_NAME,
             [PageRoute::CONTENT_PARAMETER => $content],