Rename page controllers

AlexejKossmann · Jul 10, 2020 · c4b004b · c4b004b
1 parent 04f50f1
commit c4b004b
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 6 deletions.
diff --git a/...le/src/Controller/Page/RootController.php → ...rc/Controller/Page/RootPageController.php b/...le/src/Controller/Page/RootController.php → ...rc/Controller/Page/RootPageController.php
@@ -26,7 +26,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Route;
 
-class RootController extends AbstractController implements PageRouteEnhancerInterface, CompositionAwareInterface
+class RootPageController extends AbstractController implements PageRouteEnhancerInterface, CompositionAwareInterface
 {
     /**
      * @var ContaoFramework

diff --git a/core-bundle/src/DependencyInjection/Compiler/RegisterPagesPass.php b/core-bundle/src/DependencyInjection/Compiler/RegisterPagesPass.php
@@ -139,6 +139,10 @@ private function getPageType(string $className, array $attributes): string
             $className = substr($className, 0, -10);
         }
 
+        if ('Page' === substr($className, -4)) {
+            $className = substr($className, 0, -4);
+        }
+
         return Container::underscore($className);
     }
 }
diff --git a/core-bundle/src/Resources/config/controller.yml b/core-bundle/src/Resources/config/controller.yml
@@ -3,7 +3,7 @@ services:
         autoconfigure: true
         public: true
 
-    Contao\CoreBundle\Controller\Page\RootController:
+    Contao\CoreBundle\Controller\Page\RootPageController:
         arguments:
             - '@contao.framework'
             - '@database_connection'

diff --git a/...ts/Controller/Page/RootControllerTest.php → ...ontroller/Page/RootPageControllerTest.php b/...ts/Controller/Page/RootControllerTest.php → ...ontroller/Page/RootPageControllerTest.php
@@ -12,7 +12,7 @@
 
 namespace Contao\CoreBundle\Tests\Controller\Page;
 
-use Contao\CoreBundle\Controller\Page\RootController;
+use Contao\CoreBundle\Controller\Page\RootPageController;
 use Contao\CoreBundle\Exception\NoActivePageFoundException;
 use Contao\CoreBundle\Framework\Adapter;
 use Contao\CoreBundle\Routing\Page\CompositionAwareInterface;
@@ -28,7 +28,7 @@
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
-class RootControllerTest extends TestCase
+class RootPageControllerTest extends TestCase
 {
     /**
      * @var PageModel|Adapter|MockObject
@@ -46,7 +46,7 @@ class RootControllerTest extends TestCase
     private $router;
 
     /**
-     * @var RootController
+     * @var RootPageController
      */
     private $controller;
 
@@ -65,7 +65,7 @@ protected function setUp(): void
             ->willReturn($this->router)
         ;
 
-        $this->controller = new RootController($framework, $this->connection);
+        $this->controller = new RootPageController($framework, $this->connection);
         $this->controller->setContainer($container);
     }
 

diff --git a/core-bundle/tests/DependencyInjection/Compiler/RegisterPagesPassTest.php b/core-bundle/tests/DependencyInjection/Compiler/RegisterPagesPassTest.php
@@ -13,6 +13,7 @@
 namespace Contao\CoreBundle\Tests\DependencyInjection\Compiler;
 
 use Contao\CoreBundle\ContaoCoreBundle;
+use Contao\CoreBundle\Controller\FrontendModule\TwoFactorController;
 use Contao\CoreBundle\Controller\Page\RootPageController;
 use Contao\CoreBundle\DependencyInjection\Compiler\RegisterPagesPass;
 use Contao\CoreBundle\Routing\Page\PageRegistry;
@@ -100,6 +101,33 @@ static function ($arguments) {
     }
 
     public function testStripsControllerSuffixOnGetPageTypeFromClass(): void
+    {
+        $registry = $this->createMock(Definition::class);
+        $registry
+            ->expects($this->once())
+            ->method('addMethodCall')
+            ->with(
+                'add',
+                $this->callback(
+                    static function ($arguments) {
+                        return 'two_factor' === $arguments[0];
+                    }
+                )
+            )
+        ;
+
+        $definition = new Definition(TwoFactorController::class);
+        $definition->addTag('contao.page');
+
+        $container = new ContainerBuilder();
+        $container->setDefinition(PageRegistry::class, $registry);
+        $container->setDefinition('test.controller', $definition);
+
+        $pass = new RegisterPagesPass();
+        $pass->process($container);
+    }
+
+    public function testStripsPageControllerSuffixOnGetPageTypeFromClass(): void
     {
         $registry = $this->createMock(Definition::class);
         $registry