|
95 | 95 | use Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory;
|
96 | 96 | use Symfony\Component\Mailer\Bridge\Sendinblue\Transport\SendinblueTransportFactory;
|
97 | 97 | use Symfony\Component\Mailer\Mailer;
|
| 98 | +use Symfony\Component\Mercure\HubRegistry; |
98 | 99 | use Symfony\Component\Messenger\Bridge\AmazonSqs\Transport\AmazonSqsTransportFactory;
|
99 | 100 | use Symfony\Component\Messenger\Bridge\Amqp\Transport\AmqpTransportFactory;
|
100 | 101 | use Symfony\Component\Messenger\Bridge\Beanstalkd\Transport\BeanstalkdTransportFactory;
|
@@ -2368,11 +2369,17 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
|
2368 | 2369 | }
|
2369 | 2370 | }
|
2370 | 2371 |
|
2371 |
| - if (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages) && ContainerBuilder::willBeAvailable('symfony/mercure-bundle', MercureBundle::class, $parentPackages)) { |
2372 |
| - $container->getDefinition($classToServices[MercureTransportFactory::class]) |
2373 |
| - ->replaceArgument('$publisherLocator', new ServiceLocatorArgument(new TaggedIteratorArgument('mercure.publisher', null, null, true))); |
2374 |
| - } elseif (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages)) { |
2375 |
| - $container->removeDefinition($classToServices[MercureTransportFactory::class]); |
| 2372 | + if (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages)) { |
| 2373 | + if (ContainerBuilder::willBeAvailable('symfony/mercure-bundle', MercureBundle::class, $parentPackages)) { |
| 2374 | + $definition = $container->getDefinition($classToServices[MercureTransportFactory::class]); |
| 2375 | + if (ContainerBuilder::willBeAvailable('symfony/mercure', HubRegistry::class, $parentPackages)) { |
| 2376 | + $definition->replaceArgument('$registry', new Reference(HubRegistry::class)); |
| 2377 | + } else { |
| 2378 | + $definition->replaceArgument('$registry', new ServiceLocatorArgument(new TaggedIteratorArgument('mercure.publisher', null, null, true))); |
| 2379 | + } |
| 2380 | + } else { |
| 2381 | + $container->removeDefinition($classToServices[MercureTransportFactory::class]); |
| 2382 | + } |
2376 | 2383 | }
|
2377 | 2384 |
|
2378 | 2385 | if (isset($config['admin_recipients'])) {
|
|
0 commit comments