[FrameworkBundle] add kernel.locale_aware tag to LocaleSwitcher

kbond · kbond · commit 1661c7e661bc · 2022-12-07T10:09:52.000-05:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.php
@@ -168,10 +168,11 @@
         ->set('translation.locale_switcher', LocaleSwitcher::class)
             ->args([
                 param('kernel.default_locale'),
-                tagged_iterator('kernel.locale_aware'),
+                tagged_iterator('kernel.locale_aware', exclude: 'translation.locale_switcher'),
                 service('router.request_context')->ignoreOnInvalid(),
             ])
             ->tag('kernel.reset', ['method' => 'reset'])
+            ->tag('kernel.locale_aware')
         ->alias(LocaleAwareInterface::class, 'translation.locale_switcher')
         ->alias(LocaleSwitcher::class, 'translation.locale_switcher')
     ;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -37,6 +37,7 @@
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\ResolveInstanceofConditionalsPass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveTaggedIteratorArgumentPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
@@ -2057,7 +2058,9 @@ public function testLocaleSwitcherServiceRegistered()
             $this->markTestSkipped('LocaleSwitcher not available.');
         }
 
-        $container = $this->createContainerFromFile('full');
+        $container = $this->createContainerFromFile('full', compile: false);
+        $container->addCompilerPass(new ResolveTaggedIteratorArgumentPass());
+        $container->compile();
 
         $this->assertTrue($container->has('translation.locale_switcher'));
 
@@ -2067,6 +2070,10 @@ public function testLocaleSwitcherServiceRegistered()
         $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));
+
+        $localeAwareServices = array_map(fn (Reference $r) => (string) $r, $switcherDef->getArgument(1)->getValues());
+
+        $this->assertNotContains('translation.locale_switcher', $localeAwareServices);
     }
 
     public function testHtmlSanitizer()
