Skip to content

Commit d4571a9

Browse files
Merge branch '6.2' into 6.3
* 6.2: [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 7840c04 + 194813a commit d4571a9

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
@@ -2289,12 +2289,14 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
22892289
}
22902290

22912291
if (\count($failureTransports) > 0) {
2292-
$container->getDefinition('console.command.messenger_failed_messages_retry')
2293-
->replaceArgument(0, $config['failure_transport']);
2294-
$container->getDefinition('console.command.messenger_failed_messages_show')
2295-
->replaceArgument(0, $config['failure_transport']);
2296-
$container->getDefinition('console.command.messenger_failed_messages_remove')
2297-
->replaceArgument(0, $config['failure_transport']);
2292+
if ($this->hasConsole()) {
2293+
$container->getDefinition('console.command.messenger_failed_messages_retry')
2294+
->replaceArgument(0, $config['failure_transport']);
2295+
$container->getDefinition('console.command.messenger_failed_messages_show')
2296+
->replaceArgument(0, $config['failure_transport']);
2297+
$container->getDefinition('console.command.messenger_failed_messages_remove')
2298+
->replaceArgument(0, $config['failure_transport']);
2299+
}
22982300

22992301
$failureTransportsByTransportNameServiceLocator = ServiceLocatorTagPass::register($container, $failureTransportReferencesByTransportName);
23002302
$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
@@ -192,10 +192,11 @@
192192
abstract_arg('Receivers'),
193193
service('messenger.routable_message_bus'),
194194
service('event_dispatcher'),
195-
service('logger'),
195+
service('logger')->nullOnInvalid(),
196196
service('messenger.transport.native_php_serializer')->nullOnInvalid(),
197197
])
198198
->tag('console.command')
199+
->tag('monolog.logger', ['channel' => 'messenger'])
199200

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

0 commit comments

Comments
 (0)