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