Skip to content

Commit 194813a

Browse files
Merge branch '5.4' into 6.2
* 5.4: [Security] Allow custom scheme to be used as redirection URIs [Validator] Do not mock metadata factory on debug command tests [HttpKernel][WebProfilerBundle] Fix search feature update Intl component to take into account B-variant when converting Alpha3 to Alpha2. fixing issue with Darwin. [VarDumper] Fix dumping `ArrayObject` with `DumpDataCollector` [VarDumper] Add tests to demonstrate a bug when dumping ArrayObject with full stack fmk [DebugBundle][FrameworkBundle] Fix using the framework without the Console component [FrameworkBundle] Add missing monolog channel tag to the `messenger:failed:retry` command fetch all known ChoiceType values at once [RateLimiter] fix incorrect retryAfter of FixedWindow Fix Finder phpdoc
2 parents 0e7e1ee + ff554ec commit 194813a

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2189,12 +2189,14 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
21892189
}
21902190

21912191
if (\count($failureTransports) > 0) {
2192-
$container->getDefinition('console.command.messenger_failed_messages_retry')
2193-
->replaceArgument(0, $config['failure_transport']);
2194-
$container->getDefinition('console.command.messenger_failed_messages_show')
2195-
->replaceArgument(0, $config['failure_transport']);
2196-
$container->getDefinition('console.command.messenger_failed_messages_remove')
2197-
->replaceArgument(0, $config['failure_transport']);
2192+
if ($this->hasConsole()) {
2193+
$container->getDefinition('console.command.messenger_failed_messages_retry')
2194+
->replaceArgument(0, $config['failure_transport']);
2195+
$container->getDefinition('console.command.messenger_failed_messages_show')
2196+
->replaceArgument(0, $config['failure_transport']);
2197+
$container->getDefinition('console.command.messenger_failed_messages_remove')
2198+
->replaceArgument(0, $config['failure_transport']);
2199+
}
21982200

21992201
$failureTransportsByTransportNameServiceLocator = ServiceLocatorTagPass::register($container, $failureTransportReferencesByTransportName);
22002202
$container->getDefinition('messenger.failure.send_failed_message_to_failure_transport_listener')

Resources/config/console.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,11 @@
190190
abstract_arg('Receivers'),
191191
service('messenger.routable_message_bus'),
192192
service('event_dispatcher'),
193-
service('logger'),
193+
service('logger')->nullOnInvalid(),
194194
service('messenger.transport.native_php_serializer')->nullOnInvalid(),
195195
])
196196
->tag('console.command')
197+
->tag('monolog.logger', ['channel' => 'messenger'])
197198

198199
->set('console.command.messenger_failed_messages_show', FailedMessagesShowCommand::class)
199200
->args([

0 commit comments

Comments
 (0)