bug #48330 [FrameworkBundle] do not wire the MercureTransportFactory if the MercureBundle is not enabled (xabbuh)

fabpot · fabpot · commit 961dceccf577 · 2022-11-25T17:06:40.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [FrameworkBundle] do not wire the MercureTransportFactory if the MercureBundle is not enabled | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #48305 | License | MIT | Doc PR | Commits ------- 275d2cd do not wire the MercureTransportFactory if the MercureBundle is not enabled
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2587,7 +2587,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             }
         }
 
-        if (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages, true) && ContainerBuilder::willBeAvailable('symfony/mercure-bundle', MercureBundle::class, $parentPackages, true)) {
+        if (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages, true) && ContainerBuilder::willBeAvailable('symfony/mercure-bundle', MercureBundle::class, $parentPackages, true) && \in_array(MercureBundle::class, $container->getParameter('kernel.bundles'), true)) {
             $container->getDefinition($classToServices[MercureTransportFactory::class])
                 ->replaceArgument('$registry', new Reference(HubRegistry::class));
         } elseif (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages, true)) {

Original file line number	Diff line number	Diff line change
`@@ -2587,7 +2587,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $`
`2587`	`2587`	`}`
`2588`	`2588`	`}`
`2589`	`2589`
`2590`		`- if (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages, true) && ContainerBuilder::willBeAvailable('symfony/mercure-bundle', MercureBundle::class, $parentPackages, true)) {`
	`2590`	`+ if (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages, true) && ContainerBuilder::willBeAvailable('symfony/mercure-bundle', MercureBundle::class, $parentPackages, true) && \in_array(MercureBundle::class, $container->getParameter('kernel.bundles'), true)) {`
`2591`	`2591`	`$container->getDefinition($classToServices[MercureTransportFactory::class])`
`2592`	`2592`	`->replaceArgument('$registry', new Reference(HubRegistry::class));`
`2593`	`2593`	`} elseif (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages, true)) {`