Do not override path info if we cannot process it

Author: thomas-kl1

Plugin/App/Request/StorePathInfoValidator.php

@@ -30,16 +30,18 @@ public function __construct(
     public function beforeGetValidStoreCode(Subject $subject, Http $request, string $pathInfo = ''): array
     {
         if ($this->config->isBaseUrlResolverEnabled()) {
+            $originalPathInfo = $pathInfo;
             $uri = strtok($request->getUriString(), '?') . '/';
             if ($uri !== false) {
                 if ($pathInfo === '') {
                     $pathInfo = parse_url($uri, PHP_URL_PATH);
                     if ($pathInfo === false) {
-                        return [$request, $pathInfo];
+                        return [$request, $originalPathInfo];
                     }
                     $pathInfo = strtok($pathInfo, '/');
                 }
                 $pathInfo = $pathInfo === false ? $this->resolveByWebUrl($uri) : $this->resolveByLinkUrl($uri);
+                $pathInfo = $pathInfo === '' ? $originalPathInfo : $pathInfo;
             }
         }