Skip to content

Commit 87aa3b7

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: [#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 c933aba + 9803796 commit 87aa3b7

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

27802780
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)) {
27812781
$container->getDefinition($classToServices[NotifierBridge\Mercure\MercureTransportFactory::class])
2782-
->replaceArgument('$registry', new Reference(HubRegistry::class));
2782+
->replaceArgument('$registry', new Reference(HubRegistry::class))
2783+
->replaceArgument('$client', new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
2784+
->replaceArgument('$dispatcher', new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
27832785
} elseif (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', NotifierBridge\Mercure\MercureTransportFactory::class, $parentPackages)) {
27842786
$container->removeDefinition($classToServices[NotifierBridge\Mercure\MercureTransportFactory::class]);
27852787
}
27862788

27872789
if (ContainerBuilder::willBeAvailable('symfony/fake-chat-notifier', NotifierBridge\FakeChat\FakeChatTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'])) {
27882790
$container->getDefinition($classToServices[NotifierBridge\FakeChat\FakeChatTransportFactory::class])
27892791
->replaceArgument('$mailer', new Reference('mailer'))
2790-
->replaceArgument('$logger', new Reference('logger'));
2792+
->replaceArgument('$logger', new Reference('logger'))
2793+
->replaceArgument('$client', new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
2794+
->replaceArgument('$dispatcher', new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
27912795
}
27922796

27932797
if (ContainerBuilder::willBeAvailable('symfony/fake-sms-notifier', NotifierBridge\FakeSms\FakeSmsTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'])) {
27942798
$container->getDefinition($classToServices[NotifierBridge\FakeSms\FakeSmsTransportFactory::class])
27952799
->replaceArgument('$mailer', new Reference('mailer'))
2796-
->replaceArgument('$logger', new Reference('logger'));
2800+
->replaceArgument('$logger', new Reference('logger'))
2801+
->replaceArgument('$client', new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE))
2802+
->replaceArgument('$dispatcher', new Reference('event_dispatcher', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
27972803
}
27982804

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

0 commit comments

Comments
 (0)