do not fail when MercureBundle is not installed

xabbuh · xabbuh · commit 8cdbdcb1c9aa · 2021-01-20T13:37:13.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2257,13 +2257,11 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             }
         }
 
-        if (class_exists(MercureTransportFactory::class)) {
-            if (!class_exists(MercureBundle::class)) {
-                throw new \LogicException('The MercureBundle is not registered in your application. Try running "composer require symfony/mercure-bundle".');
-            }
-
+        if (class_exists(MercureTransportFactory::class) && class_exists(MercureBundle::class)) {
             $container->getDefinition($classToServices[MercureTransportFactory::class])
                 ->replaceArgument('$publisherLocator', new ServiceLocatorArgument(new TaggedIteratorArgument('mercure.publisher', null, null, true)));
+        } elseif (class_exists(MercureTransportFactory::class)) {
+            $container->removeDefinition($classToServices[MercureTransportFactory::class]);
         }
 
         if (isset($config['admin_recipients'])) {

Original file line number	Diff line number	Diff line change
`@@ -2257,13 +2257,11 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $`
`2257`	`2257`	`}`
`2258`	`2258`	`}`
`2259`	`2259`
`2260`		`- if (class_exists(MercureTransportFactory::class)) {`
`2261`		`- if (!class_exists(MercureBundle::class)) {`
`2262`		`- throw new \LogicException('The MercureBundle is not registered in your application. Try running "composer require symfony/mercure-bundle".');`
`2263`		`- }`
`2264`		`-`
	`2260`	`+ if (class_exists(MercureTransportFactory::class) && class_exists(MercureBundle::class)) {`
`2265`	`2261`	`$container->getDefinition($classToServices[MercureTransportFactory::class])`
`2266`	`2262`	`->replaceArgument('$publisherLocator', new ServiceLocatorArgument(new TaggedIteratorArgument('mercure.publisher', null, null, true)));`
	`2263`	`+ } elseif (class_exists(MercureTransportFactory::class)) {`
	`2264`	`+ $container->removeDefinition($classToServices[MercureTransportFactory::class]);`
`2267`	`2265`	`}`
`2268`	`2266`
`2269`	`2267`	`if (isset($config['admin_recipients'])) {`