From cbbb37aa6d288c1081d622015d521339dc1c06e1 Mon Sep 17 00:00:00 2001
From: Benjamin Piwowarski <benjamin@piwowarski.fr>
Date: Thu, 26 Sep 2019 22:53:50 +0200
Subject: [PATCH 1/2] Fix bug when removing base URL

---
 src/Bridge/Symfony/Routing/Router.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Bridge/Symfony/Routing/Router.php b/src/Bridge/Symfony/Routing/Router.php
index 3959a6c39ed..f3a95a15187 100644
--- a/src/Bridge/Symfony/Routing/Router.php
+++ b/src/Bridge/Symfony/Routing/Router.php
@@ -71,7 +71,10 @@ public function getRouteCollection()
     public function match($pathInfo)
     {
         $baseContext = $this->router->getContext();
-        $pathInfo = str_replace($baseContext->getBaseUrl(), '', $pathInfo);
+        $baseURL = $baseContext->getBaseUrl();
+        if (strpos($pathInfo, $baseURL) === 0) {
+            $pathInfo = substr($pathInfo, strlen($baseURL));
+        }
 
         $request = Request::create($pathInfo, 'GET', [], [], [], ['HTTP_HOST' => $baseContext->getHost()]);
         try {

From c6f1f74a431a3163efcf029d0334f68c751c17e5 Mon Sep 17 00:00:00 2001
From: Benjamin Piwowarski <benjamin@piwowarski.fr>
Date: Thu, 26 Sep 2019 23:02:29 +0200
Subject: [PATCH 2/2] Syntax fixes

---
 src/Bridge/Symfony/Routing/Router.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bridge/Symfony/Routing/Router.php b/src/Bridge/Symfony/Routing/Router.php
index f3a95a15187..8257f739b5d 100644
--- a/src/Bridge/Symfony/Routing/Router.php
+++ b/src/Bridge/Symfony/Routing/Router.php
@@ -72,8 +72,8 @@ public function match($pathInfo)
     {
         $baseContext = $this->router->getContext();
         $baseURL = $baseContext->getBaseUrl();
-        if (strpos($pathInfo, $baseURL) === 0) {
-            $pathInfo = substr($pathInfo, strlen($baseURL));
+        if (0 === strpos($pathInfo, $baseURL)) {
+            $pathInfo = substr($pathInfo, \strlen($baseURL));
         }
 
         $request = Request::create($pathInfo, 'GET', [], [], [], ['HTTP_HOST' => $baseContext->getHost()]);