Skip to content

Commit b43089d

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: 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
2 parents 10efe09 + 73da034 commit b43089d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2596,7 +2596,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
25962596
}
25972597
}
25982598

2599-
if (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages) && ContainerBuilder::willBeAvailable('symfony/mercure-bundle', MercureBundle::class, $parentPackages)) {
2599+
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)) {
26002600
$container->getDefinition($classToServices[MercureTransportFactory::class])
26012601
->replaceArgument('$registry', new Reference(HubRegistry::class));
26022602
} elseif (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages)) {

0 commit comments

Comments
 (0)