Merge branch '6.3' into 6.4

* 6.3:
  fix #51235 - fix the order of merging of serializationContext and self::CONTEXT_DENORMALIZE
  [HttpClient] Fix Static Code Analyzer issue with JsonMockResponse
  [Messenger] Fix exiting `FailedMessagesRetryCommand`
  [Serializer] Fix reindex normalizedData array in AbstractObjectNormalizer::denormalize()
  [Validator] Fix `File::$extensions`’ PHPDoc
  [Mime] Fix email (de)serialization issues
  [Serializer] Fix parsing XML root node attributes
  fix parsing of payload timestamp to DateTimeImmutable
  Fix routing to multiple fallback transports
  Fix missing stamps in delayed message handling
  [DoctrineBridge] Ignore invalid stores in `LockStoreSchemaListener` raised by `StoreFactory`

Author: nicolas-grekas

DependencyInjection/FrameworkExtension.php

@@ -2122,6 +2122,16 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             $container->getDefinition('messenger.transport.beanstalkd.factory')->addTag('messenger.transport_factory');
         }
 
+        if ($config['stop_worker_on_signals'] && $this->hasConsole()) {
+            $container->getDefinition('console.command.messenger_consume_messages')
+                ->replaceArgument(8, $config['stop_worker_on_signals']);
+            $container->getDefinition('console.command.messenger_failed_messages_retry')
+                ->replaceArgument(6, $config['stop_worker_on_signals']);
+        }
+
+        if ($this->hasConsole() && $container->hasDefinition('messenger.listener.stop_worker_signals_listener')) {
+            $container->getDefinition('messenger.listener.stop_worker_signals_listener')->clearTag('kernel.event_subscriber');
+        }
         if (!class_exists(StopWorkerOnSignalsListener::class)) {
             $container->removeDefinition('messenger.listener.stop_worker_signals_listener');
         } elseif ($config['stop_worker_on_signals']) {

Resources/config/console.php

@@ -165,6 +165,7 @@
                 service('messenger.listener.reset_services')->nullOnInvalid(),
                 [], // Bus names
                 service('messenger.rate_limiter_locator')->nullOnInvalid(),
+                null,
             ])
             ->tag('console.command')
             ->tag('monolog.logger', ['channel' => 'messenger'])
@@ -196,6 +197,7 @@
                 service('event_dispatcher'),
                 service('logger')->nullOnInvalid(),
                 service('messenger.transport.native_php_serializer')->nullOnInvalid(),
+                null,
             ])
             ->tag('console.command')
             ->tag('monolog.logger', ['channel' => 'messenger'])