From b204bf4299be41bd5ff94ae46343a7943182f3ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Niedzielski?= <pawel.niedzielski@ibexa.co>
Date: Wed, 10 Jan 2024 13:04:45 +0100
Subject: [PATCH] IBX-5821: Fixed an issue where incomplete request object was
 passed over to route Matcher

---
 src/bundle/Core/Routing/DefaultRouter.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/bundle/Core/Routing/DefaultRouter.php b/src/bundle/Core/Routing/DefaultRouter.php
index 58f601e59b..209869e2fa 100644
--- a/src/bundle/Core/Routing/DefaultRouter.php
+++ b/src/bundle/Core/Routing/DefaultRouter.php
@@ -64,13 +64,15 @@ public function setSiteAccessRouter(SiteAccessRouterInterface $siteAccessRouter)
 
     public function matchRequest(Request $request)
     {
-        $siteAccessRequest = $request->duplicate();
-        $siteAccessRequest->server->set(
-            'REQUEST_URI',
-            $request->attributes->get('semanticPathinfo', $request->getPathInfo())
-        );
+        if ($request->attributes->has('semanticPathinfo')) {
+            $request = $request->duplicate();
+            $request->server->set(
+                'REQUEST_URI',
+                $request->attributes->get('semanticPathinfo')
+            );
+        }
 
-        return parent::matchRequest($siteAccessRequest);
+        return parent::matchRequest($request);
     }
 
     public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH)