Skip to content

Commit 7440f74

Browse files
committed
Merge branch '5.4' into 6.3
* 5.4: Do not instantiate object if it is not instantiable Add missing translation for Uzbek (uz) [CI] Show exit code when job fails [CI] Use stable version of psalm Add check for lazy object interface [Notifier] [Bridges] Provide EventDispatcher and HttpClient to the transports
2 parents 2c97c26 + 81e1b14 commit 7440f74

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2811,21 +2811,27 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
28112811

28122812
if (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', NotifierBridge\Mercure\MercureTransportFactory::class, $parentPackages) && ContainerBuilder::willBeAvailable('symfony/mercure-bundle', MercureBundle::class, $parentPackages) && \in_array(MercureBundle::class, $container->getParameter('kernel.bundles'), true)) {
28132813
$container->getDefinition($classToServices[NotifierBridge\Mercure\MercureTransportFactory::class])
2814-
->replaceArgument('$registry', new Reference(HubRegistry::class));
2814+
->replaceArgument('$registry', new Reference(HubRegistry::class))
2815+
->replaceArgument('$client', new Reference('http_client'))
2816+
->replaceArgument('$dispatcher', new Reference('event_dispatcher'));
28152817
} elseif (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', NotifierBridge\Mercure\MercureTransportFactory::class, $parentPackages)) {
28162818
$container->removeDefinition($classToServices[NotifierBridge\Mercure\MercureTransportFactory::class]);
28172819
}
28182820

28192821
if (ContainerBuilder::willBeAvailable('symfony/fake-chat-notifier', NotifierBridge\FakeChat\FakeChatTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'])) {
28202822
$container->getDefinition($classToServices[NotifierBridge\FakeChat\FakeChatTransportFactory::class])
28212823
->replaceArgument('$mailer', new Reference('mailer'))
2822-
->replaceArgument('$logger', new Reference('logger'));
2824+
->replaceArgument('$logger', new Reference('logger'))
2825+
->replaceArgument('$client', new Reference('http_client'))
2826+
->replaceArgument('$dispatcher', new Reference('event_dispatcher'));
28232827
}
28242828

28252829
if (ContainerBuilder::willBeAvailable('symfony/fake-sms-notifier', NotifierBridge\FakeSms\FakeSmsTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'])) {
28262830
$container->getDefinition($classToServices[NotifierBridge\FakeSms\FakeSmsTransportFactory::class])
28272831
->replaceArgument('$mailer', new Reference('mailer'))
2828-
->replaceArgument('$logger', new Reference('logger'));
2832+
->replaceArgument('$logger', new Reference('logger'))
2833+
->replaceArgument('$client', new Reference('http_client'))
2834+
->replaceArgument('$dispatcher', new Reference('event_dispatcher'));
28292835
}
28302836

28312837
if (isset($config['admin_recipients'])) {

0 commit comments

Comments
 (0)