Merge branch '7.2' into 7.3

* 7.2: (37 commits)
  fix dumped markup
  improve amqp connection issues
  [Serializer] [ObjectNormalizer] Filter int when using FILTER_BOOL
  Fix #53778
  Issue 59387-2: make check with prefix more robust
  [PropertyInfo] Add missing test
  fix tests
  [Security][Validators] Review translations.
  [validator] Updated Dutch translation
  [FrameworkBundle] Fix wiring ConsoleProfilerListener
  [HttpKernel] Fix link to php doc
  [Lock] Make sure RedisStore will also support Valkey
  [Validator] Update sr_Cyrl 120:This value is not a valid slug.
  [Validator] Update sr_Latn 120:This value is not a valid slug.
  6.4 Missing translations for Italian (it) #59419
  tests(notifier): avoid failing SNS test with local AWS configuration
  Fix typo ratio comment
  chore: PropertyAccess - fix typo in DocBlock
  [Validator] Missing translations for Brazilian Portuguese (pt_BR)
  fix(dependency-injection): reset env vars with kernel.reset
  ...

Author: xabbuh

Command/ContainerDebugCommand.php

@@ -290,7 +290,9 @@ private function findProperServiceName(InputInterface $input, SymfonyStyle $io,
             return $matchingServices[0];
         }
 
-        return $io->choice('Select one of the following services to display its information', $matchingServices);
+        natsort($matchingServices);
+
+        return $io->choice('Select one of the following services to display its information', array_values($matchingServices));
     }
 
     private function findProperTagName(InputInterface $input, SymfonyStyle $io, ContainerBuilder $container, string $tagName): string
@@ -308,7 +310,9 @@ private function findProperTagName(InputInterface $input, SymfonyStyle $io, Cont
             return $matchingTags[0];
         }
 
-        return $io->choice('Select one of the following tags to display its information', $matchingTags);
+        natsort($matchingTags);
+
+        return $io->choice('Select one of the following tags to display its information', array_values($matchingTags));
     }
 
     private function findServiceIdsContaining(ContainerBuilder $container, string $name, bool $showHidden): array

EventListener/ConsoleProfilerListener.php

@@ -38,6 +38,8 @@ final class ConsoleProfilerListener implements EventSubscriberInterface
     /** @var \SplObjectStorage<Request, ?Request> */
     private \SplObjectStorage $parents;
 
+    private bool $disabled = false;
+
     public function __construct(
         private readonly Profiler $profiler,
         private readonly RequestStack $requestStack,
@@ -66,7 +68,7 @@ public function initialize(ConsoleCommandEvent $event): void
 
         $input = $event->getInput();
         if (!$input->hasOption('profile') || !$input->getOption('profile')) {
-            $this->profiler->disable();
+            $this->disabled = true;
 
             return;
         }
@@ -92,7 +94,12 @@ public function catch(ConsoleErrorEvent $event): void
 
     public function profile(ConsoleTerminateEvent $event): void
     {
-        if (!$this->cliMode || !$this->profiler->isEnabled()) {
+        $error = $this->error;
+        $this->error = null;
+
+        if (!$this->cliMode || $this->disabled) {
+            $this->disabled = false;
+
             return;
         }
 
@@ -114,8 +121,7 @@ public function profile(ConsoleTerminateEvent $event): void
         $request->command->exitCode = $event->getExitCode();
         $request->command->interruptedBySignal = $event->getInterruptingSignal();
 
-        $profile = $this->profiler->collect($request, $request->getResponse(), $this->error);
-        $this->error = null;
+        $profile = $this->profiler->collect($request, $request->getResponse(), $error);
         $this->profiles[$request] = $profile;
 
         if ($this->parents[$request] = $this->requestStack->getParentRequest()) {

Resources/config/profiling.php

@@ -40,14 +40,19 @@
 
         ->set('console_profiler_listener', ConsoleProfilerListener::class)
             ->args([
-                service('profiler'),
+                service('.lazy_profiler'),
                 service('.virtual_request_stack'),
                 service('debug.stopwatch'),
                 param('kernel.runtime_mode.cli'),
                 service('router')->nullOnInvalid(),
             ])
             ->tag('kernel.event_subscriber')
 
+        ->set('.lazy_profiler', Profiler::class)
+            ->factory('current')
+            ->args([[service('profiler')]])
+            ->lazy()
+
         ->set('.virtual_request_stack', VirtualRequestStack::class)
             ->args([service('request_stack')])
             ->public()

Resources/config/services.php

@@ -100,6 +100,7 @@ class_exists(WorkflowEvents::class) ? WorkflowEvents::ALIASES : []
         ->alias(HttpKernelInterface::class, 'http_kernel')
 
         ->set('request_stack', RequestStack::class)
+            ->tag('kernel.reset', ['method' => 'resetRequestFormats', 'on_invalid' => 'ignore'])
             ->public()
         ->alias(RequestStack::class, 'request_stack')
 
@@ -197,6 +198,7 @@ class_exists(WorkflowEvents::class) ? WorkflowEvents::ALIASES : []
                 tagged_iterator('container.env_var_loader'),
             ])
             ->tag('container.env_var_processor')
+            ->tag('kernel.reset', ['method' => 'reset'])
 
         ->set('slugger', AsciiSlugger::class)
             ->args([

Tests/Functional/ContainerDebugCommandTest.php

@@ -140,13 +140,13 @@ public function testTagsPartialSearch()
         $tester->run(['command' => 'debug:container', '--tag' => 'kernel.'], ['decorated' => false]);
 
         $this->assertStringContainsString('Select one of the following tags to display its information', $tester->getDisplay());
-        $this->assertStringContainsString('[0] kernel.event_subscriber', $tester->getDisplay());
-        $this->assertStringContainsString('[1] kernel.locale_aware', $tester->getDisplay());
-        $this->assertStringContainsString('[2] kernel.cache_warmer', $tester->getDisplay());
+        $this->assertStringContainsString('[0] kernel.cache_clearer', $tester->getDisplay());
+        $this->assertStringContainsString('[1] kernel.cache_warmer', $tester->getDisplay());
+        $this->assertStringContainsString('[2] kernel.event_subscriber', $tester->getDisplay());
         $this->assertStringContainsString('[3] kernel.fragment_renderer', $tester->getDisplay());
-        $this->assertStringContainsString('[4] kernel.reset', $tester->getDisplay());
-        $this->assertStringContainsString('[5] kernel.cache_clearer', $tester->getDisplay());
-        $this->assertStringContainsString('Symfony Container Services Tagged with "kernel.event_subscriber" Tag', $tester->getDisplay());
+        $this->assertStringContainsString('[4] kernel.locale_aware', $tester->getDisplay());
+        $this->assertStringContainsString('[5] kernel.reset', $tester->getDisplay());
+        $this->assertStringContainsString('Symfony Container Services Tagged with "kernel.cache_clearer" Tag', $tester->getDisplay());
     }
 
     public function testDescribeEnvVars()