Skip to content

Commit c6c5729

Browse files
Merge branch '6.3' into 6.4
* 6.3: [PhpUnitBridge] Ignore deprecations about the annotation mapping driver when it's not possible to move to the attribute driver yet [SecurityBundle] Mark SignatureAlgorithmFactory as internal remove unusable cache pools GH-50526: Reverting ExecutionContextInterface void return types in favor of docblock annotations.
2 parents ab63adb + 2f1ee51 commit c6c5729

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,8 @@ public function load(array $configs, ContainerBuilder $container)
342342
}
343343

344344
$this->registerAssetMapperConfiguration($config['asset_mapper'], $container, $loader, $this->readConfigEnabled('assets', $container, $config['assets']));
345+
} else {
346+
$container->removeDefinition('cache.asset_mapper');
345347
}
346348

347349
if ($this->readConfigEnabled('http_client', $container, $config['http_client'])) {
@@ -485,6 +487,7 @@ public function load(array $configs, ContainerBuilder $container)
485487
}
486488
$this->registerSchedulerConfiguration($config['scheduler'], $container, $loader);
487489
} else {
490+
$container->removeDefinition('cache.scheduler');
488491
$container->removeDefinition('console.command.scheduler_debug');
489492
}
490493

0 commit comments

Comments
 (0)