add format-suffix handling

sulu · Aug 3, 2023 · a58f7c3 · a58f7c3
1 parent ea6267e
commit a58f7c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Controller/WebsiteRedirectController.php b/Controller/WebsiteRedirectController.php
@@ -34,8 +34,12 @@ public function redirect(Request $request, RedirectRouteInterface $redirectRoute
 
         $queryString = http_build_query($request->query->all());
 
+        $requestFormat = $request->getRequestFormat(null);
+        $formatSuffix = $requestFormat ? ('.' . $requestFormat) : '';
+
         $url = [
             $redirectRoute->getTarget(),
+            $formatSuffix,
             false === strpos($redirectRoute->getTarget(), '?') ? '?' : '&',
             $queryString,
         ];

diff --git a/Routing/RedirectRouteProvider.php b/Routing/RedirectRouteProvider.php
@@ -49,10 +49,11 @@ public function getRouteCollectionForRequest(Request $request): RouteCollection
         // server encodes the url and symfony does not encode it
         // symfony decodes this data here https://github.com/symfony/symfony/blob/v5.2.3/src/Symfony/Component/Routing/Matcher/UrlMatcher.php#L88
         $pathInfo = rawurldecode($request->getPathInfo());
+        $path = \str_replace('.' . $request->getRequestFormat(), '', $pathInfo);
         $host = $request->getHost();
 
         $routeCollection = new RouteCollection();
-        if (!$redirectRoute = $this->redirectRouteRepository->findEnabledBySource($pathInfo, $host)) {
+        if (!$redirectRoute = $this->redirectRouteRepository->findEnabledBySource($path, $host)) {
             return $routeCollection;
         }