Fix malformated uri (during build)

thomas-kl1 · web-flow · commit cc420bcee611 · 2024-04-02T17:57:11.000+02:00
diff --git a/Plugin/App/Request/StorePathInfoValidator.php b/Plugin/App/Request/StorePathInfoValidator.php
@@ -32,7 +32,10 @@ public function beforeGetValidStoreCode(Subject $subject, Http $request, string
         if ($this->config->isEnabled()) {
             $uri = explode('?', $request->getUriString())[0] . '/';
             if ($pathInfo === '') {
-                $pathInfo = strtok(parse_url($uri, PHP_URL_PATH), '/');
+                $pathInfo = parse_url($uri, PHP_URL_PATH);
+                if ($pathInfo !== false) {
+                    $pathInfo = strtok($pathInfo, '/');
+                }
             }
             $pathInfo = $pathInfo === false ? $this->resolveByWebUrl($uri) : $this->resolveByLinkUrl($uri, $pathInfo);
         }

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