Skip to content

Commit 9803796

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: [#53153] fix merge [Workflow] Fix test [WebProfilerBundle] Fix JS error when evaluating scripts don't fail when optional dependencies are not present fix syntax error on PHP 7.2 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 fc2b774 + e7fab4b commit 9803796

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
@@ -2776,21 +2776,27 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
27762776

27772777
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)) {
27782778
$container->getDefinition($classToServices[NotifierBridge\Mercure\MercureTransportFactory::class])
2779-
->replaceArgument('$registry', new Reference(HubRegistry::class));
2779+
->replaceArgument('$registry', new Reference(HubRegistry::class))
2780+
->replaceArgument('$client', new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
2781+
->replaceArgument('$dispatcher', new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
27802782
} elseif (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', NotifierBridge\Mercure\MercureTransportFactory::class, $parentPackages)) {
27812783
$container->removeDefinition($classToServices[NotifierBridge\Mercure\MercureTransportFactory::class]);
27822784
}
27832785

27842786
if (ContainerBuilder::willBeAvailable('symfony/fake-chat-notifier', NotifierBridge\FakeChat\FakeChatTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'])) {
27852787
$container->getDefinition($classToServices[NotifierBridge\FakeChat\FakeChatTransportFactory::class])
27862788
->replaceArgument('$mailer', new Reference('mailer'))
2787-
->replaceArgument('$logger', new Reference('logger'));
2789+
->replaceArgument('$logger', new Reference('logger'))
2790+
->replaceArgument('$client', new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
2791+
->replaceArgument('$dispatcher', new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
27882792
}
27892793

27902794
if (ContainerBuilder::willBeAvailable('symfony/fake-sms-notifier', NotifierBridge\FakeSms\FakeSmsTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'])) {
27912795
$container->getDefinition($classToServices[NotifierBridge\FakeSms\FakeSmsTransportFactory::class])
27922796
->replaceArgument('$mailer', new Reference('mailer'))
2793-
->replaceArgument('$logger', new Reference('logger'));
2797+
->replaceArgument('$logger', new Reference('logger'))
2798+
->replaceArgument('$client', new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
2799+
->replaceArgument('$dispatcher', new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
27942800
}
27952801

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

0 commit comments

Comments
 (0)