mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-26 03:58:45 +02:00
N°6934 - Symfony 6.4 - upgrade Symfony bundles to 6.4 (#580)
* Update Symfony lib to version ~6.4.0 * Update code missing return type * Add an iTop general configuration entry to store application secret (Symfony mandatory parameter) * Use dependency injection in ExceptionListener & UserProvider classes
This commit is contained in:
@@ -15,9 +15,11 @@ use Psr\Container\ContainerInterface;
|
||||
use Symfony\Bridge\Twig\AppVariable;
|
||||
use Symfony\Bridge\Twig\DataCollector\TwigDataCollector;
|
||||
use Symfony\Bridge\Twig\ErrorRenderer\TwigErrorRenderer;
|
||||
use Symfony\Bridge\Twig\EventListener\TemplateAttributeListener;
|
||||
use Symfony\Bridge\Twig\Extension\AssetExtension;
|
||||
use Symfony\Bridge\Twig\Extension\CodeExtension;
|
||||
use Symfony\Bridge\Twig\Extension\ExpressionExtension;
|
||||
use Symfony\Bridge\Twig\Extension\HtmlSanitizerExtension;
|
||||
use Symfony\Bridge\Twig\Extension\HttpFoundationExtension;
|
||||
use Symfony\Bridge\Twig\Extension\HttpKernelExtension;
|
||||
use Symfony\Bridge\Twig\Extension\HttpKernelRuntime;
|
||||
@@ -52,7 +54,6 @@ use Twig\TemplateWrapper;
|
||||
return static function (ContainerConfigurator $container) {
|
||||
$container->services()
|
||||
->set('twig', Environment::class)
|
||||
->public()
|
||||
->args([service('twig.loader'), abstract_arg('Twig options')])
|
||||
->call('addGlobal', ['app', service('twig.app_variable')])
|
||||
->call('addRuntimeLoader', [service('twig.runtime_loader')])
|
||||
@@ -65,9 +66,9 @@ return static function (ContainerConfigurator $container) {
|
||||
->tag('container.preload', ['class' => ExtensionSet::class])
|
||||
->tag('container.preload', ['class' => Template::class])
|
||||
->tag('container.preload', ['class' => TemplateWrapper::class])
|
||||
->tag('container.private', ['package' => 'symfony/twig-bundle', 'version' => '5.2'])
|
||||
|
||||
->alias('Twig_Environment', 'twig')
|
||||
->deprecate('symfony/twig-bundle', '6.3', 'The "%alias_id%" service alias is deprecated, use "'.Environment::class.'" or "twig" instead.')
|
||||
->alias(Environment::class, 'twig')
|
||||
|
||||
->set('twig.app_variable', AppVariable::class)
|
||||
@@ -75,9 +76,11 @@ return static function (ContainerConfigurator $container) {
|
||||
->call('setDebug', [param('kernel.debug')])
|
||||
->call('setTokenStorage', [service('security.token_storage')->ignoreOnInvalid()])
|
||||
->call('setRequestStack', [service('request_stack')->ignoreOnInvalid()])
|
||||
->call('setLocaleSwitcher', [service('translation.locale_switcher')->ignoreOnInvalid()])
|
||||
->call('setEnabledLocales', [param('kernel.enabled_locales')])
|
||||
|
||||
->set('twig.template_iterator', TemplateIterator::class)
|
||||
->args([service('kernel'), abstract_arg('Twig paths'), param('twig.default_path')])
|
||||
->args([service('kernel'), abstract_arg('Twig paths'), param('twig.default_path'), abstract_arg('File name pattern')])
|
||||
|
||||
->set('twig.template_cache_warmer', TemplateCacheWarmer::class)
|
||||
->args([service(ContainerInterface::class), service('twig.template_iterator')])
|
||||
@@ -120,6 +123,9 @@ return static function (ContainerConfigurator $container) {
|
||||
|
||||
->set('twig.extension.expression', ExpressionExtension::class)
|
||||
|
||||
->set('twig.extension.htmlsanitizer', HtmlSanitizerExtension::class)
|
||||
->args([tagged_locator('html_sanitizer', 'sanitizer')])
|
||||
|
||||
->set('twig.extension.httpkernel', HttpKernelExtension::class)
|
||||
|
||||
->set('twig.runtime.httpkernel', HttpKernelRuntime::class)
|
||||
@@ -167,5 +173,9 @@ return static function (ContainerConfigurator $container) {
|
||||
->args([service('serializer')])
|
||||
|
||||
->set('twig.extension.serializer', SerializerExtension::class)
|
||||
|
||||
->set('controller.template_attribute_listener', TemplateAttributeListener::class)
|
||||
->args([service('twig')])
|
||||
->tag('kernel.event_subscriber')
|
||||
;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user