Merge pull request #2209 from pascalheidmann/fix-site-based-request-r…

…esolver Throw exception if site store isnt found in SiteBasedRequestResolver
coreshop · Feb 16, 2023 · 4b04f76 · 4b04f76
2 parents a79f9b9 + 1982140
commit 4b04f76
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/CoreShop/Component/Store/Context/RequestBased/SiteBasedRequestResolver.php b/src/CoreShop/Component/Store/Context/RequestBased/SiteBasedRequestResolver.php
@@ -34,15 +34,18 @@ public function __construct(
     public function findStore(Request $request): ?StoreInterface
     {
         if (Site::isSiteRequest()) {
-            return $this->storeRepository->findOneBySite(Site::getCurrentSite()->getId());
+            $store = $this->storeRepository->findOneBySite(Site::getCurrentSite()->getId());
+
+            if ($store !== null) {
+                return $store;
+            }
         }
 
         $defaultStore = $this->storeRepository->findStandard();
 
-        if (null === $defaultStore) {
-            throw new StoreNotFoundException();
+        if ($defaultStore) {
+            return $defaultStore;
         }
-
-        return $defaultStore;
+        throw new StoreNotFoundException();
     }
 }