Correctly support absolute URLs with empty prefix

AlexejKossmann · Jul 21, 2020 · 64b388e · 64b388e
1 parent ded7d5c
commit 64b388e
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/core-bundle/src/Routing/Candidates/PageCandidates.php b/core-bundle/src/Routing/Candidates/PageCandidates.php
@@ -90,8 +90,12 @@ private function addRegexQuery(QueryBuilder $queryBuilder, string $pathInfo): bo
             $paths[] = '(?P<'.$type.'>'.substr($pathRegex, 2, strrpos($pathRegex, '$') - 2).')';
         }
 
+        $prefixes = array_map(static function ($prefix) {
+            return $prefix ? preg_quote('/'.$prefix, '#') : '';
+        }, $this->urlPrefixes);
+
         preg_match_all(
-            '#^(/'.implode('|/', array_map('preg_quote', $this->urlPrefixes)).')('.implode('|', $paths).')('.implode('|', array_map('preg_quote', $this->urlSuffixes)).')'.'$#sD',
+            '#^('.implode('|', $prefixes).')('.implode('|', $paths).')('.implode('|', array_map('preg_quote', $this->urlSuffixes)).')'.'$#sD',
             $pathInfo,
             $matches
         );

diff --git a/core-bundle/tests/Routing/Candidates/CandidatesTest.php b/core-bundle/tests/Routing/Candidates/CandidatesTest.php
@@ -428,6 +428,40 @@ public function testIncluesPageWithAbsolutePathAndSuffix(): void
         $this->assertSame(['bar/baz', 'bar', 'bar/baz.html', 15], $candidates->getCandidates($request));
     }
 
+    public function testIncluesPageWithAbsolutePathWithoutPrefix(): void
+    {
+        $request = $this->mockRequest('/bar/baz.html');
+
+        $queryBuilder = $this->createMock(QueryBuilder::class);
+        $queryBuilder
+            ->expects($this->once())
+            ->method('orWhere')
+            ->with('type IN (:types)')
+            ->willReturnSelf()
+        ;
+
+        $queryBuilder
+            ->expects($this->once())
+            ->method('setParameter')
+            ->with('types', ['foo', 'bar'], Connection::PARAM_STR_ARRAY)
+            ->willReturnSelf()
+        ;
+
+        $pageRegistry = $this->mockPageRegistry(['foo', ''], ['.html']);
+        $pageRegistry
+            ->expects($this->once())
+            ->method('getPathRegex')
+            ->willReturn([
+                'foo' => '#^/bar/[a-z]+$#sD',
+                'bar' => '#^/bar$#sD',
+            ])
+        ;
+
+        $candidates = new PageCandidates($this->mockConnection($queryBuilder), $pageRegistry);
+
+        $this->assertSame(['bar/baz', 'bar', 15], $candidates->getCandidates($request));
+    }
+
     /**
      * @return Request&MockObject
      */