Skip to content

Commit 1996981

Browse files
committed
Merge branch '6.1' into 6.2
* 6.1: 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 6d2551f + b43089d commit 1996981

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
@@ -2609,7 +2609,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
26092609
}
26102610
}
26112611

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

0 commit comments

Comments
 (0)