Merge 3.x into 4.x

UPGRADE-3.0.md

@@ -1,6 +1,11 @@
 UPGRADE FROM 2.x to 3.0
 =======================
 
+## Removed `Sonata\TranslationBundle\EventSubscriber\UserLocaleSubscriber`
+
+In case you need to set the locale based on the user's preferences, you MUST implement your own event
+listener, for that you can follow https://symfony.com/index.php/doc/4.4/session/locale_sticky_session.html#setting-the-locale-based-on-the-user-s-preferences
+
 ## Dropped support for PHPCR
 
 This bundle no longer supports `doctrine/phpcr-odm`, the implementation was based on having installed

composer.json

@@ -26,6 +26,7 @@
         "symfony/config": "^4.4 || ^5.3 || ^6.0",
         "symfony/dependency-injection": "^4.4 || ^5.3 || ^6.0",
         "symfony/form": "^4.4 || ^5.3 || ^6.0",
+        "symfony/framework-bundle": "^4.4 || ^5.3 || ^6.0",
         "symfony/http-foundation": "^4.4 || ^5.3 || ^6.0",
         "symfony/http-kernel": "^4.4 || ^5.3 || ^6.0",
         "symfony/intl": "^4.4 || ^5.3 || ^6.0",
@@ -53,7 +54,6 @@
         "sonata-project/doctrine-orm-admin-bundle": "^4.0",
         "symfony/browser-kit": "^4.4 || ^5.3 || ^6.0",
         "symfony/css-selector": "^4.4 || ^5.3 || ^6.0",
-        "symfony/framework-bundle": "^4.4 || ^5.3 || ^6.0",
         "symfony/phpunit-bridge": "^5.3 || ^6.0",
         "vimeo/psalm": "^4.3.2",
         "weirdan/doctrine-psalm-plugin": "^2.0"

src/Resources/config/service_locale_switcher.php

@@ -12,7 +12,6 @@
  */
 
 use Sonata\TranslationBundle\EventSubscriber\LocaleSubscriber;
-use Sonata\TranslationBundle\EventSubscriber\UserLocaleSubscriber;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
@@ -24,8 +23,5 @@
             ->tag('kernel.event_subscriber')
             ->args([
                 '%kernel.default_locale%',
-            ])
-
-        ->set('sonata_translation.locale_switcher.user_locale_subscriber', UserLocaleSubscriber::class)
-            ->tag('kernel.event_subscriber');
+            ]);
 };