Merge pull request #87 from delyriand/fix/78-avoid-404-error

fix: avoid 404 error due to the Accept-Language header

Author: Maxime

UPGRADE-2.0.md

@@ -1,4 +1,9 @@
-# Upgrade from 1.X to 2.X
+# Upgrade from 2.0.2 to 2.0.3
+
+The `MonsieurBiz\SyliusCmsPagePlugin\Context\LastChanceLocaleContext` is now deprecated and will be removed in 2.1, use the `MonsieurBiz\SyliusCmsPagePlugin\Context\FindInRequestPathLocaleContext` instead.
+And the priority of this service has changed from `-127` to `35` to be higher than the `sylius.context.locale.request_header_based` service.
+
+# Upgrade from 1.X to 2.0.X
 
 In the 2.x we changed the route definition for the shop route.
 
@@ -32,4 +37,4 @@ monsieurbiz_cms_page_show:
     condition: "not(context.getPathInfo() matches '`^%sylius.security.api_route%`') and context.checkPageSlug(request)"
 ```
 
-We upgraded also the [Rich Editor to the 3.0 version](https://github.com/monsieurbiz/SyliusRichEditorPlugin/blob/3.x/UPGRADE-3.0.md).  
+We upgraded also the [Rich Editor to the 3.0 version](https://github.com/monsieurbiz/SyliusRichEditorPlugin/blob/3.x/UPGRADE-3.0.md).

src/Context/LastChanceLocaleContext.php renamed to src/Context/FindInRequestPathLocaleContext.php

@@ -18,19 +18,20 @@
 use Sylius\Component\Locale\Provider\LocaleProviderInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 
-final class LastChanceLocaleContext implements LocaleContextInterface
+final class FindInRequestPathLocaleContext implements LocaleContextInterface
 {
     public function __construct(
         private RequestStack $requestStack,
-        private LocaleProviderInterface $localeProvider
+        private LocaleProviderInterface $localeProvider,
     ) {
     }
 
     public function getLocaleCode(): string
     {
         if (null === $request = $this->requestStack->getMainRequest()) {
-            throw new LocaleNotFoundException('Main request not found, therefore no locale found…');
+            throw new LocaleNotFoundException('No main request available.');
         }
+
         $pathInfo = $request->getPathInfo();
         $availableLocaleCodes = $this->localeProvider->getAvailableLocalesCodes();
         $parts = explode('/', trim($pathInfo, '/'));
@@ -40,6 +41,6 @@ public function getLocaleCode(): string
             }
         }
 
-        return $this->localeProvider->getDefaultLocaleCode();
+        throw new LocaleNotFoundException('No locale found in the request path.');
     }
 }

src/Resources/config/services.yaml

@@ -12,10 +12,18 @@ services:
         resource: '../../Controller'
         tags: ['controller.service_arguments']
 
-    # Let's try to find the locale one more time!
-    MonsieurBiz\SyliusCmsPagePlugin\Context\LastChanceLocaleContext:
+    # Let's try to find the locale from the request path.
+    # The priority should be higher than the sylius.context.locale.request_header_based service to avoid 404 errors with 
+    MonsieurBiz\SyliusCmsPagePlugin\Context\FindInRequestPathLocaleContext:
         tags:
-            - { name: sylius.context.locale, priority: -127 }
+            - { name: sylius.context.locale, priority: 35 }
+    
+    MonsieurBiz\SyliusCmsPagePlugin\Context\LastChanceLocaleContext:
+        alias: MonsieurBiz\SyliusCmsPagePlugin\Context\FindInRequestPathLocaleContext
+        deprecated:
+            package: 'monsieurbiz/sylius-cms-page-plugin'
+            version: '2.0.3'
+            message: 'The "%alias_id%" service alias is deprecated and will be removed in 2.1. Use "MonsieurBiz\SyliusCmsPagePlugin\Context\FindInRequestPathLocaleContext" instead.'
 
     # Menu item in admin panel
     MonsieurBiz\SyliusCmsPagePlugin\Listener\AdminMenuListener: