Bypass resolver if uri is invalid

opengento · Apr 2, 2024 · 5109b3f · 5109b3f
1 parent cc420bc
commit 5109b3f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Plugin/App/Request/StorePathInfoValidator.php b/Plugin/App/Request/StorePathInfoValidator.php
@@ -33,9 +33,10 @@ public function beforeGetValidStoreCode(Subject $subject, Http $request, string
             $uri = explode('?', $request->getUriString())[0] . '/';
             if ($pathInfo === '') {
                 $pathInfo = parse_url($uri, PHP_URL_PATH);
-                if ($pathInfo !== false) {
-                    $pathInfo = strtok($pathInfo, '/');
+                if ($pathInfo === false) {
+                    return [$request, $pathInfo];
                 }
+                $pathInfo = strtok($pathInfo, '/');
             }
             $pathInfo = $pathInfo === false ? $this->resolveByWebUrl($uri) : $this->resolveByLinkUrl($uri, $pathInfo);
         }