symfony · fabpot · Apr 14, 2022 · Apr 14, 2022 · nicolas-grekas · Apr 14, 2022
diff --git a/...mfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ConfigureLocaleSwitcherPass.php b/...mfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ConfigureLocaleSwitcherPass.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -205,6 +205,7 @@
 use Symfony\Component\Translation\Bridge\Loco\LocoProviderFactory;
 use Symfony\Component\Translation\Bridge\Lokalise\LokaliseProviderFactory;
 use Symfony\Component\Translation\Command\XliffLintCommand as BaseXliffLintCommand;
+use Symfony\Component\Translation\LocaleSwitcher;
 use Symfony\Component\Translation\PseudoLocalizationTranslator;
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\Uid\Factory\UuidFactory;
@@ -1082,7 +1083,6 @@ private function registerRouterConfiguration(array $config, ContainerBuilder $co
             $container->removeDefinition('console.command.router_debug');
             $container->removeDefinition('console.command.router_match');
             $container->removeDefinition('messenger.middleware.router_context');
-            $container->removeDefinition('translation.locale_aware_request_context');
 
             return;
         }
@@ -1295,6 +1295,11 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
         }
 
         $loader->load('translation.php');
+
+        if (!ContainerBuilder::willBeAvailable('symfony/translation', LocaleSwitcher::class, ['symfony/framework-bundle'])) {
+            $container->removeDefinition('translation.locale_switcher');
+        }
+
         $loader->load('translation_providers.php');
 
         // Use the "real" translator instead of the identity default

diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -15,7 +15,6 @@
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddDebugLogProcessorPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddExpressionLanguageProvidersPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AssetsContextPass;
-use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ConfigureLocaleSwitcherPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ContainerBuilderDebugDumpPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\DataCollectorTranslatorPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\LoggingTranslatorPass;
@@ -164,7 +163,6 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new RegisterReverseContainerPass(true));
         $container->addCompilerPass(new RegisterReverseContainerPass(false), PassConfig::TYPE_AFTER_REMOVING);
         $container->addCompilerPass(new RemoveUnusedSessionMarshallingHandlerPass());
-        $container->addCompilerPass(new ConfigureLocaleSwitcherPass());
 
         if ($container->getParameter('kernel.debug')) {
             $container->addCompilerPass(new AddDebugLogProcessorPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 2);

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.php
@@ -13,7 +13,6 @@
 
 use Psr\Container\ContainerInterface;
 use Symfony\Bundle\FrameworkBundle\CacheWarmer\TranslationsCacheWarmer;
-use Symfony\Bundle\FrameworkBundle\Translation\LocaleAwareRequestContext;
 use Symfony\Bundle\FrameworkBundle\Translation\Translator;
 use Symfony\Component\Translation\Dumper\CsvFileDumper;
 use Symfony\Component\Translation\Dumper\IcuResFileDumper;
@@ -46,6 +45,7 @@
 use Symfony\Component\Translation\Reader\TranslationReaderInterface;
 use Symfony\Component\Translation\Writer\TranslationWriter;
 use Symfony\Component\Translation\Writer\TranslationWriterInterface;
+use Symfony\Contracts\Translation\LocaleAwareInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 return static function (ContainerConfigurator $container) {
@@ -164,22 +164,15 @@
             ->args([service(ContainerInterface::class)])
             ->tag('container.service_subscriber', ['id' => 'translator'])
             ->tag('kernel.cache_warmer')
-    ;
-
-    if (class_exists(LocaleSwitcher::class)) {
-        $container->services()
-            ->set('translation.locale_switcher', LocaleSwitcher::class)
-            ->args([
-                param('kernel.default_locale'),
-                abstract_arg('LocaleAware services'),
-            ])
-            ->alias(LocaleSwitcher::class, 'translation.locale_switcher')
 
-            ->set('translation.locale_aware_request_context', LocaleAwareRequestContext::class)
+        ->set('translation.locale_switcher', LocaleSwitcher::class)
             ->args([
-                service('router.request_context'),
                 param('kernel.default_locale'),
+                tagged_iterator('kernel.locale_aware'),
+                service('router.request_context')->ignoreOnInvalid(),
             ])
-        ;
-    }
+            ->tag('kernel.reset', ['method' => 'reset'])
+        ->alias(LocaleAwareInterface::class, 'translation.locale_switcher')
+        ->alias(LocaleSwitcher::class, 'translation.locale_switcher')
+    ;
 };
diff --git a/...le/FrameworkBundle/Tests/DependencyInjection/Compiler/ConfigureLocaleSwitcherPassTest.php b/...le/FrameworkBundle/Tests/DependencyInjection/Compiler/ConfigureLocaleSwitcherPassTest.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -31,7 +31,6 @@
 use Symfony\Component\Cache\Adapter\TagAwareAdapter;
 use Symfony\Component\Cache\DependencyInjection\CachePoolPass;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
-use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
@@ -2019,15 +2018,13 @@ public function testLocaleSwitcherServiceRegistered()
         $container = $this->createContainerFromFile('full');
 
         $this->assertTrue($container->has('translation.locale_switcher'));
-        $this->assertTrue($container->has('translation.locale_aware_request_context'));
 
         $switcherDef = $container->getDefinition('translation.locale_switcher');
-        $localeAwareRequestContextDef = $container->getDefinition('translation.locale_aware_request_context');
 
         $this->assertSame('%kernel.default_locale%', $switcherDef->getArgument(0));
-        $this->assertInstanceOf(AbstractArgument::class, $switcherDef->getArgument(1));
-        $this->assertEquals(new Reference('router.request_context'), $localeAwareRequestContextDef->getArgument(0));
-        $this->assertSame('%kernel.default_locale%', $localeAwareRequestContextDef->getArgument(1));
+        $this->assertInstanceOf(TaggedIteratorArgument::class, $switcherDef->getArgument(1));
+        $this->assertSame('kernel.locale_aware', $switcherDef->getArgument(1)->getTag());
+        $this->assertEquals(new Reference('router.request_context', ContainerBuilder::IGNORE_ON_INVALID_REFERENCE), $switcherDef->getArgument(2));
     }
 
     protected function createContainer(array $data = [])

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/LocaleAwareRequestContextTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/LocaleAwareRequestContextTest.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/LocaleAwareRequestContext.php b/src/Symfony/Bundle/FrameworkBundle/Translation/LocaleAwareRequestContext.php
diff --git a/src/Symfony/Component/Translation/LocaleSwitcher.php b/src/Symfony/Component/Translation/LocaleSwitcher.php
@@ -11,23 +11,31 @@
 
 namespace Symfony\Component\Translation;
 
+use Symfony\Component\Routing\RequestContext;
 use Symfony\Contracts\Translation\LocaleAwareInterface;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
  */
-final class LocaleSwitcher implements LocaleAwareInterface
+class LocaleSwitcher implements LocaleAwareInterface
 {
+    private string $defaultLocale;
+
     /**
      * @param LocaleAwareInterface[] $localeAwareServices
      */
-    public function __construct(private string $locale, private iterable $localeAwareServices)
-    {
+    public function __construct(
+        private string $locale,
+        private iterable $localeAwareServices,
+        private ?RequestContext $requestContext = null,
+    ) {
+        $this->defaultLocale = $locale;
     }
 
     public function setLocale(string $locale): void
     {
         \Locale::setDefault($this->locale = $locale);
+        $this->requestContext?->setParameter('_locale', $locale);
 
         foreach ($this->localeAwareServices as $service) {
             $service->setLocale($locale);
@@ -42,17 +50,26 @@ public function getLocale(): string
     /**
      * Switch to a new locale, execute a callback, then switch back to the original.
      *
-     * @param callable():void $callback
+     * @template T
+     *
+     * @param callable():T $callback
+     *
+     * @return T
      */
-    public function runWithLocale(string $locale, callable $callback): void
+    public function runWithLocale(string $locale, callable $callback): mixed
     {
         $original = $this->getLocale();
         $this->setLocale($locale);
 
         try {
-            $callback();
+            return $callback();
         } finally {
             $this->setLocale($original);
         }
     }
+
+    public function reset(): void
+    {
+        $this->setLocale($this->defaultLocale);
+    }
 }
diff --git a/src/Symfony/Component/Translation/Tests/LocaleSwitcherTest.php b/src/Symfony/Component/Translation/Tests/LocaleSwitcherTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Translation\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Translation\LocaleSwitcher;
 use Symfony\Contracts\Translation\LocaleAwareInterface;
 
@@ -75,6 +76,24 @@ public function testCanSwitchLocaleForCallback()
         $this->assertSame('en', $service->getLocale());
         $this->assertSame('en', $switcher->getLocale());
     }
+
+    public function testWithRequestContext()
+    {
+        $context = new RequestContext();
+        $service = new LocaleSwitcher('en', [], $context);
+
+        $this->assertSame('en', $service->getLocale());
+
+        $service->setLocale('fr');
+
+        $this->assertSame('fr', $service->getLocale());
+        $this->assertSame('fr', $context->getParameter('_locale'));
+
+        $service->reset();
+
+        $this->assertSame('en', $service->getLocale());
+        $this->assertSame('en', $context->getParameter('_locale'));
+    }
 }
 
 class DummyLocaleAware implements LocaleAwareInterface