composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-25 19:48:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°6934 - Symfony 6.4 - upgrade Symfony bundles to 6.4 (#580)

Browse Source 
* 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:
bdalsass
2023-12-05 13:56:56 +01:00
committed by GitHub
parent 863ab4560c
commit 27ce51ab07
1392 changed files with 44869 additions and 27799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
lib/symfony/twig-bundle/DependencyInjection/Configuration.php
View File

@@ -15,6 +15,7 @@ use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;
use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
use Symfony\Component\Mime\HtmlToTextConverter\HtmlToTextConverterInterface;
/**
* TwigExtension configuration structure.
@@ -25,16 +26,14 @@ class Configuration implements ConfigurationInterface
{
/**
* Generates the configuration tree builder.
*
* @return TreeBuilder
*/
public function getConfigTreeBuilder()
public function getConfigTreeBuilder(): TreeBuilder
{
$treeBuilder = new TreeBuilder('twig');
$rootNode = $treeBuilder->getRootNode();
$rootNode->beforeNormalization()
->ifTrue(function ($v) { return \is_array($v) && \array_key_exists('exception_controller', $v); })
->ifTrue(fn ($v) => \is_array($v) && \array_key_exists('exception_controller', $v))
->then(function ($v) {
if (isset($v['exception_controller'])) {
throw new InvalidConfigurationException('Option "exception_controller" under "twig" must be null or unset, use "error_controller" under "framework" instead.');
@@ -50,11 +49,12 @@ class Configuration implements ConfigurationInterface
$this->addGlobalsSection($rootNode);
$this->addTwigOptions($rootNode);
$this->addTwigFormatOptions($rootNode);
$this->addMailerSection($rootNode);
return $treeBuilder;
}
private function addFormThemesSection(ArrayNodeDefinition $rootNode)
private function addFormThemesSection(ArrayNodeDefinition $rootNode): void
{
$rootNode
->fixXmlConfig('form_theme')
@@ -64,17 +64,15 @@ class Configuration implements ConfigurationInterface
->prototype('scalar')->defaultValue('form_div_layout.html.twig')->end()
->example(['@My/form.html.twig'])
->validate()
->ifTrue(function ($v) { return !\in_array('form_div_layout.html.twig', $v); })
->then(function ($v) {
return array_merge(['form_div_layout.html.twig'], $v);
})
->ifTrue(fn ($v) => !\in_array('form_div_layout.html.twig', $v))
->then(fn ($v) => array_merge(['form_div_layout.html.twig'], $v))
->end()
->end()
->end()
;
}
private function addGlobalsSection(ArrayNodeDefinition $rootNode)
private function addGlobalsSection(ArrayNodeDefinition $rootNode): void
{
$rootNode
->fixXmlConfig('global')
@@ -86,7 +84,7 @@ class Configuration implements ConfigurationInterface
->prototype('array')
->normalizeKeys(false)
->beforeNormalization()
->ifTrue(function ($v) { return \is_string($v) && str_starts_with($v, '@'); })
->ifTrue(fn ($v) => \is_string($v) && str_starts_with($v, '@'))
->then(function ($v) {
if (str_starts_with($v, '@@')) {
return substr($v, 1);
@@ -106,7 +104,7 @@ class Configuration implements ConfigurationInterface
return true;
})
->then(function ($v) { return ['value' => $v]; })
->then(fn ($v) => ['value' => $v])
->end()
->children()
->scalarNode('id')->end()
@@ -124,12 +122,15 @@ class Configuration implements ConfigurationInterface
;
}
private function addTwigOptions(ArrayNodeDefinition $rootNode)
private function addTwigOptions(ArrayNodeDefinition $rootNode): void
{
$rootNode
->fixXmlConfig('path')
->children()
->variableNode('autoescape')->defaultValue('name')->end()
->variableNode('autoescape')
->defaultValue('name')
->setDeprecated('symfony/twig-bundle', '6.1', 'Option "%node%" at "%path%" is deprecated, use autoescape_service[_method] instead.')
->end()
->scalarNode('autoescape_service')->defaultNull()->end()
->scalarNode('autoescape_service_method')->defaultNull()->end()
->scalarNode('base_template_class')->example('Twig\Template')->cannotBeEmpty()->end()
@@ -143,6 +144,15 @@ class Configuration implements ConfigurationInterface
->info('The default path used to load templates')
->defaultValue('%kernel.project_dir%/templates')
->end()
->arrayNode('file_name_pattern')
->example('*.twig')
->info('Pattern of file name used for cache warmer and linter')
->beforeNormalization()
->ifString()
->then(fn ($value) => [$value])
->end()
->prototype('scalar')->end()
->end()
->arrayNode('paths')
->normalizeKeys(false)
->useAttributeAsKey('paths')
@@ -175,7 +185,7 @@ class Configuration implements ConfigurationInterface
;
}
private function addTwigFormatOptions(ArrayNodeDefinition $rootNode)
private function addTwigFormatOptions(ArrayNodeDefinition $rootNode): void
{
$rootNode
->children()
@@ -203,4 +213,20 @@ class Configuration implements ConfigurationInterface
->end()
;
}
private function addMailerSection(ArrayNodeDefinition $rootNode): void
{
$rootNode
->children()
->arrayNode('mailer')
->children()
->scalarNode('html_to_text_converter')
->info(sprintf('A service implementing the "%s"', HtmlToTextConverterInterface::class))
->defaultNull()
->end()
->end()
->end()
->end()
;
}
}