Bypass resolver if uri is invalid

thomas-kl1 · web-flow · commit 5109b3f76002 · 2024-04-02T18:34:36.000+02:00
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);
         }

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,10 @@ public function beforeGetValidStoreCode(Subject $subject, Http $request, string`
`33`	`33`	`$uri = explode('?', $request->getUriString())[0] . '/';`
`34`	`34`	`if ($pathInfo === '') {`
`35`	`35`	`$pathInfo = parse_url($uri, PHP_URL_PATH);`
`36`		`- if ($pathInfo !== false) {`
`37`		`- $pathInfo = strtok($pathInfo, '/');`
	`36`	`+ if ($pathInfo === false) {`
	`37`	`+ return [$request, $pathInfo];`
`38`	`38`	`}`
	`39`	`+ $pathInfo = strtok($pathInfo, '/');`
`39`	`40`	`}`
`40`	`41`	`$pathInfo = $pathInfo === false ? $this->resolveByWebUrl($uri) : $this->resolveByLinkUrl($uri, $pathInfo);`
`41`	`42`	`}`