Correctly match a request with url prefix if there is no index page

AlexejKossmann · Jul 20, 2020 · b01b059 · b01b059
1 parent ab6cb7e
commit b01b059
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 6 deletions.
diff --git a/core-bundle/src/Routing/Candidates/PageCandidates.php b/core-bundle/src/Routing/Candidates/PageCandidates.php
@@ -46,7 +46,22 @@ public function getCandidates(Request $request): array
     {
         $this->initialize();
 
-        return parent::getCandidates($request);
+        $candidates = parent::getCandidates($request);
+
+        if (\in_array('index', $candidates, true)) {
+            $result = $this->connection->executeQuery(
+                "SELECT IF(alias='', id, alias) FROM tl_page WHERE type='root' AND (dns=:httpHost OR dns='')",
+                ['httpHost' => $request->getHttpHost()]
+            );
+
+            $candidates = array_merge(
+                $candidates,
+                ['/'],
+                $result->fetchAll(FetchMode::COLUMN)
+            );
+        }
+
+        return array_unique($candidates);
     }
 
     /**

diff --git a/core-bundle/src/Routing/RouteProvider.php b/core-bundle/src/Routing/RouteProvider.php
@@ -384,7 +384,8 @@ static function (Route $a, Route $b) use ($languages, $routes) {
     private function findRootPages(string $httpHost): array
     {
         if (
-            !empty($GLOBALS['TL_HOOKS']['getRootPageFromUrl'])
+            $this->legacyRouting
+            && !empty($GLOBALS['TL_HOOKS']['getRootPageFromUrl'])
             && \is_array($GLOBALS['TL_HOOKS']['getRootPageFromUrl'])
         ) {
             /** @var System $system */

diff --git a/core-bundle/tests/Functional/RoutingTest.php b/core-bundle/tests/Functional/RoutingTest.php
@@ -662,6 +662,16 @@ public function getAliasesWithLocale(): \Generator
             'root-with-home.local',
             true,
         ];
+
+        yield 'Redirects to the first regular page if the alias is not "index" and the request is only the prefix' => [
+            ['theme', 'root-with-home-and-prefix'],
+            '/en/',
+            302,
+            'Redirecting to http://root-with-home.local/en/home.html',
+            ['language' => 'en'],
+            'root-with-home.local',
+            false,
+        ];
     }
 
     /**

diff --git a/core-bundle/tests/Routing/Candidates/CandidatesTest.php b/core-bundle/tests/Routing/Candidates/CandidatesTest.php
@@ -280,7 +280,7 @@ public function getCandidatesProvider(): \Generator
             ['.html'],
             ['en'],
             [
-                'default' => ['index'],
+                'default' => ['index', '/', 'foobar'],
                 'legacy' => [],
                 'locale' => [],
             ],
@@ -408,20 +408,32 @@ public function getCandidatesProvider(): \Generator
      */
     private function mockConnectionWithLanguages(array $languages): Connection
     {
-        $statement = $this->createMock(Statement::class);
-        $statement
+        $prefixStatement = $this->createMock(Statement::class);
+        $prefixStatement
             ->expects($this->once())
             ->method('fetchAll')
             ->with(FetchMode::COLUMN)
             ->willReturn($languages)
         ;
 
         $connection = $this->createMock(Connection::class);
+
         $connection
             ->expects($this->once())
             ->method('query')
             ->with("SELECT DISTINCT urlPrefix FROM tl_page WHERE type='root'")
-            ->willReturn($statement)
+            ->willReturn($prefixStatement)
+        ;
+
+        $rootStatement = $this->createMock(Statement::class);
+        $rootStatement
+            ->method('fetchAll')
+            ->willReturn(['foobar'])
+        ;
+
+        $connection
+            ->method('executeQuery')
+            ->willReturn($rootStatement)
         ;
 
         return $connection;