Merge branch '5.4' into 6.0

derrabus · derrabus · commit ac099ef8dba6 · 2022-11-25T19:58:46.000+01:00
* 5.4:
  parse unquoted digits in tag values as integers
  do not wire the MercureTransportFactory if the MercureBundle is not enabled
  skip tests if the signal to be sent is not available
  skip a test if the signal to be sent is not available
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -2478,7 +2478,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             }
         }
 
-        if (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages) && ContainerBuilder::willBeAvailable('symfony/mercure-bundle', MercureBundle::class, $parentPackages)) {
+        if (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages) && ContainerBuilder::willBeAvailable('symfony/mercure-bundle', MercureBundle::class, $parentPackages) && \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)) {

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