Merge branch '4.4' into 5.2
* 4.4: [FrameworkBundle] Return early
This commit is contained in:
commit
b6f1667abc
@ -971,7 +971,10 @@ class FrameworkExtension extends Extension
|
||||
->replaceArgument(0, $config['default_uri']);
|
||||
}
|
||||
|
||||
if (\PHP_VERSION_ID >= 80000 || $this->annotationsConfigEnabled) {
|
||||
if (\PHP_VERSION_ID < 80000 && !$this->annotationsConfigEnabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
$container->register('routing.loader.annotation', AnnotatedRouteControllerLoader::class)
|
||||
->setPublic(false)
|
||||
->addTag('routing.loader', ['priority' => -10])
|
||||
@ -993,7 +996,6 @@ class FrameworkExtension extends Extension
|
||||
new Reference('routing.loader.annotation'),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
private function registerSessionConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
|
||||
{
|
||||
|
Reference in New Issue
Block a user