Optim + fix store resolver when path is unset

Author: thomas-kl1

App/Request/PathInfoProcessor.php

@@ -12,6 +12,7 @@
 use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\App\Request\PathInfoProcessor as AppPathInfoProcessor;
 use Magento\Store\App\Request\StorePathInfoValidator;
+use Opengento\StorePathUrl\Model\Config;
 use Opengento\StorePathUrl\Service\PathResolver;
 
 use function str_starts_with;
@@ -23,11 +24,17 @@ class PathInfoProcessor extends AppPathInfoProcessor
     public function __construct(
         private StorePathInfoValidator $storePathInfoValidator,
         private PathResolver $pathResolver,
-        private StoreRepositoryInterface $storeRepository
+        private StoreRepositoryInterface $storeRepository,
+        private Config $config,
+        private AppPathInfoProcessor $subject
     ) {}
 
     public function process(RequestInterface $request, $pathInfo): string
     {
+        if (!$this->config->isEnabled()) {
+            return $this->subject->process($request, $pathInfo);
+        }
+
         $storeCode = $this->storePathInfoValidator->getValidStoreCode($request, $pathInfo);
         if ($storeCode !== null) {
             try {

Model/Config.php

@@ -30,7 +30,7 @@ public function __construct(
     public function isEnabled(): bool
     {
         return $this->scopeConfig->isSetFlag(Store::XML_PATH_STORE_IN_URL)
-            && $this->getStorePathType() !== PathType::StoreCode;
+            && ($this->getStorePathType() !== PathType::StoreCode || $this->isUnsetSingleStorePath());
     }
 
     public function getStorePathType(): PathType

Plugin/App/Request/StorePathInfoValidator.php

@@ -17,7 +17,6 @@
 use function explode;
 use function parse_url;
 use function strtok;
-use function trim;
 
 use const PHP_URL_PATH;
 
@@ -33,7 +32,7 @@ public function beforeGetValidStoreCode(Subject $subject, Http $request, string
         if ($this->config->isEnabled()) {
             $uri = explode('?', $request->getUriString())[0] . '/';
             if ($pathInfo === '') {
-                $pathInfo = strtok(trim(parse_url($uri, PHP_URL_PATH), '/'), '/');
+                $pathInfo = strtok(parse_url($uri, PHP_URL_PATH), '/');
             }
             $pathInfo = $pathInfo === false ? $this->resolveByWebUrl($uri) : $this->resolveByLinkUrl($uri, $pathInfo);
         }