Merge branch '6.1' into 6.2

* 6.1:
  [HttpFoundation] IPv4-mapped IPv6 addresses incorrectly rejected
  Minor (comment only), part 2
  [RateLimiter] Add typecast to Reservation::wait
  [FrameworkBundle] add `kernel.locale_aware` tag to `LocaleSwitcher`
  [FrameworkBundle] Remove check of undefined service in mailer assertions
  [VarDumper] Ignore \Error in __debugInfo()

Author: nicolas-grekas

Resources/config/translation.php

@@ -186,10 +186,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')
     ;

Test/MailerAssertionsTrait.php

@@ -123,10 +123,6 @@ private static function getMessageMailerEvents(): MessageEvents
             return $container->get('mailer.message_logger_listener')->getEvents();
         }
 
-        if ($container->has('mailer.logger_message_listener')) {
-            return $container->get('mailer.logger_message_listener')->getEvents();
-        }
-
         static::fail('A client must have Mailer enabled to make email assertions. Did you forget to require symfony/mailer?');
     }
 }

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;
@@ -2067,7 +2068,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'));
 
@@ -2077,6 +2080,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()