Update RootController, no longer needs additional interfaces

core-bundle/src/Controller/Page/RootPageController.php

@@ -15,27 +15,11 @@
 use Contao\CoreBundle\Controller\AbstractController;
 use Contao\CoreBundle\Exception\NoActivePageFoundException;
 use Contao\CoreBundle\Monolog\ContaoContext;
-use Contao\CoreBundle\Routing\Page\CompositionAwareInterface;
-use Contao\CoreBundle\Routing\Page\PageRoute;
-use Contao\CoreBundle\Routing\Page\PageRouteEnhancerInterface;
 use Contao\PageModel;
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\FetchMode;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Route;
 
-class RootPageController extends AbstractController implements PageRouteEnhancerInterface, CompositionAwareInterface
+class RootPageController extends AbstractController
 {
-    /**
-     * @var Connection
-     */
-    private $connection;
-
-    public function __construct(Connection $connection)
-    {
-        $this->connection = $connection;
-    }
-
     public function __invoke(PageModel $pageModel): Response
     {
         if ('root' !== $pageModel->type) {
@@ -45,24 +29,6 @@ public function __invoke(PageModel $pageModel): Response
         return $this->redirectToContent($this->getNextPage((int) $pageModel->id));
     }
 
-    public function enhancePageRoute(PageRoute $route): Route
-    {
-        return $route;
-    }
-
-    public function getUrlSuffixes(): array
-    {
-        return $this->connection
-            ->query("SELECT DISTINCT urlSuffix FROM tl_page WHERE type='root'")
-            ->fetchAll(FetchMode::COLUMN)
-        ;
-    }
-
-    public function supportsContentComposition(PageModel $pageModel): bool
-    {
-        return false;
-    }
-
     private function getNextPage(int $rootPageId): PageModel
     {
         $this->initializeContaoFramework();

core-bundle/src/Resources/config/controller.yml

@@ -4,8 +4,6 @@ services:
         public: true
 
     Contao\CoreBundle\Controller\Page\RootPageController:
-        arguments:
-            - '@database_connection'
         tags:
             - { name: contao.page, contentComposition: false }
             - { name: monolog.logger, channel: contao }

core-bundle/src/Resources/config/routing.yml

@@ -10,7 +10,9 @@ services:
         arguments:
             - '@Contao\CoreBundle\Routing\RouteFactory'
 
-    Contao\CoreBundle\Routing\Page\PageRegistry: ~
+    Contao\CoreBundle\Routing\Page\PageRegistry:
+        arguments:
+            - '@database_connection'
 
     Contao\CoreBundle\Routing\RouteFactory:
         arguments:

core-bundle/tests/Controller/Page/RootPageControllerTest.php

@@ -14,14 +14,9 @@
 
 use Contao\CoreBundle\Controller\Page\RootPageController;
 use Contao\CoreBundle\Exception\NoActivePageFoundException;
-use Contao\CoreBundle\Routing\Page\CompositionAwareInterface;
 use Contao\CoreBundle\Routing\Page\PageRoute;
-use Contao\CoreBundle\Routing\Page\PageRouteEnhancerInterface;
 use Contao\CoreBundle\Tests\TestCase;
 use Contao\PageModel;
-use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\FetchMode;
-use Doctrine\DBAL\Statement;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -34,11 +29,6 @@ class RootPageControllerTest extends TestCase
      */
     private $pageModelAdapter;
 
-    /**
-     * @var Connection&MockObject
-     */
-    private $connection;
-
     /**
      * @var UrlGeneratorInterface&MockObject
      */
@@ -55,7 +45,6 @@ protected function setUp(): void
         $pageModelAdapter = $this->mockAdapter(['findFirstPublishedByPid']);
         $this->pageModelAdapter = $pageModelAdapter;
 
-        $this->connection = $this->createMock(Connection::class);
         $this->router = $this->createMock(UrlGeneratorInterface::class);
 
         $framework = $this->mockContaoFramework([PageModel::class => $this->pageModelAdapter]);
@@ -71,16 +60,10 @@ protected function setUp(): void
             )
         ;
 
-        $this->controller = new RootPageController($this->connection);
+        $this->controller = new RootPageController();
         $this->controller->setContainer($container);
     }
 
-    public function testImplementsTheInterfaces(): void
-    {
-        $this->assertInstanceOf(PageRouteEnhancerInterface::class, $this->controller);
-        $this->assertInstanceOf(CompositionAwareInterface::class, $this->controller);
-    }
-
     public function testThrowsExceptionIfPageTypeIsNotSupported(): void
     {
         /** @var PageModel&MockObject $page */
@@ -136,32 +119,4 @@ public function testCreatesRedirectResponseToFirstPage(): void
         $this->assertInstanceOf(RedirectResponse::class, $response);
         $this->assertSame('https://www.example.org/en/foobar.html', $response->getTargetUrl());
     }
-
-    public function testReturnsUrlSuffixesFromDatabase(): void
-    {
-        $statement = $this->createMock(Statement::class);
-        $statement
-            ->expects($this->once())
-            ->method('fetchAll')
-            ->with(FetchMode::COLUMN)
-            ->willReturn(['foo', 'bar'])
-        ;
-
-        $this->connection
-            ->expects($this->once())
-            ->method('query')
-            ->with("SELECT DISTINCT urlSuffix FROM tl_page WHERE type='root'")
-            ->willReturn($statement)
-        ;
-
-        $this->assertSame(['foo', 'bar'], $this->controller->getUrlSuffixes());
-    }
-
-    public function testDoesNotSupportContentComposition(): void
-    {
-        /** @var PageModel&MockObject $page */
-        $page = $this->mockClassWithProperties(PageModel::class);
-
-        $this->assertFalse($this->controller->supportsContentComposition($page));
-    }
 }