mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-28 04:58:46 +02:00
N°8910 - Upgrade Symfony packages (#811)
This commit is contained in:
Benjamin Dalsass
@@ -34,7 +34,10 @@ class TestServiceContainerWeakRefPass implements CompilerPassInterface
|
||||
$definitions = $container->getDefinitions();
|
||||
|
||||
foreach ($definitions as $id => $definition) {
|
||||
if ($id && '.' !== $id[0] && (!$definition->isPublic() || $definition->isPrivate() || $definition->hasTag('container.private')) && !$definition->hasErrors() && !$definition->isAbstract()) {
|
||||
if ($inner = $definition->getTag('container.decorator')[0]['inner'] ?? null) {
|
||||
$privateServices[$inner] = new Reference($inner, ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE);
|
||||
}
|
||||
if ($id && '.' !== $id[0] && ($definition->isPrivate() || $definition->hasTag('container.private')) && !$definition->hasErrors() && !$definition->isAbstract()) {
|
||||
$privateServices[$id] = new Reference($id, ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -358,7 +358,7 @@ class Configuration implements ConfigurationInterface
|
||||
->arrayNode('workflows')
|
||||
->canBeEnabled()
|
||||
->beforeNormalization()
|
||||
->always(function ($v) {
|
||||
->always(static function ($v) {
|
||||
if (\is_array($v) && true === $v['enabled']) {
|
||||
$workflows = $v;
|
||||
unset($workflows['enabled']);
|
||||
@@ -367,7 +367,7 @@ class Configuration implements ConfigurationInterface
|
||||
$workflows = [];
|
||||
}
|
||||
|
||||
if (1 === \count($workflows) && isset($workflows['workflows']) && !array_is_list($workflows['workflows']) && array_diff(array_keys($workflows['workflows']), ['audit_trail', 'type', 'marking_store', 'supports', 'support_strategy', 'initial_marking', 'places', 'transitions'])) {
|
||||
if (1 === \count($workflows) && isset($workflows['workflows']) && !array_is_list($workflows['workflows']) && array_diff_key($workflows['workflows'], ['audit_trail' => 1, 'type' => 1, 'marking_store' => 1, 'supports' => 1, 'support_strategy' => 1, 'initial_marking' => 1, 'places' => 1, 'transitions' => 1])) {
|
||||
$workflows = $workflows['workflows'];
|
||||
}
|
||||
|
||||
@@ -473,27 +473,16 @@ class Configuration implements ConfigurationInterface
|
||||
throw new InvalidConfigurationException('The "places" option must be an array in workflow configuration.');
|
||||
}
|
||||
|
||||
// It's an indexed array of shape ['place1', 'place2']
|
||||
if (isset($places[0]) && \is_string($places[0])) {
|
||||
return array_map(function (string $place) {
|
||||
return ['name' => $place];
|
||||
}, $places);
|
||||
}
|
||||
|
||||
// It's an indexed array, we let the validation occur
|
||||
if (isset($places[0]) && \is_array($places[0])) {
|
||||
return $places;
|
||||
}
|
||||
|
||||
foreach ($places as $name => $place) {
|
||||
if (\is_array($place) && \array_key_exists('name', $place)) {
|
||||
continue;
|
||||
$normalizedPlaces = [];
|
||||
foreach ($places as $key => $value) {
|
||||
if (!\is_array($value)) {
|
||||
$value = ['name' => $value];
|
||||
}
|
||||
$place['name'] = $name;
|
||||
$places[$name] = $place;
|
||||
$value['name'] ??= $key;
|
||||
$normalizedPlaces[] = $value;
|
||||
}
|
||||
|
||||
return array_values($places);
|
||||
return $normalizedPlaces;
|
||||
})
|
||||
->end()
|
||||
->isRequired()
|
||||
@@ -516,26 +505,26 @@ class Configuration implements ConfigurationInterface
|
||||
->end()
|
||||
->arrayNode('transitions')
|
||||
->beforeNormalization()
|
||||
->always()
|
||||
->then(function ($transitions) {
|
||||
->always(static function ($transitions) {
|
||||
if (!\is_array($transitions)) {
|
||||
throw new InvalidConfigurationException('The "transitions" option must be an array in workflow configuration.');
|
||||
}
|
||||
|
||||
// It's an indexed array, we let the validation occur
|
||||
if (isset($transitions[0]) && \is_array($transitions[0])) {
|
||||
return $transitions;
|
||||
}
|
||||
|
||||
foreach ($transitions as $name => $transition) {
|
||||
if (\is_array($transition) && \array_key_exists('name', $transition)) {
|
||||
continue;
|
||||
$normalizedTransitions = [];
|
||||
foreach ($transitions as $key => $transition) {
|
||||
if (\is_array($transition)) {
|
||||
if (\is_string($key = $transition['key'] ?? $key)) {
|
||||
$transition['name'] ??= $key;
|
||||
}
|
||||
if (!($transition['name'] ?? false)) {
|
||||
throw new InvalidConfigurationException('The "name" option is required for each transition in workflow configuration.');
|
||||
}
|
||||
unset($transition['key']);
|
||||
}
|
||||
$transition['name'] = $name;
|
||||
$transitions[$name] = $transition;
|
||||
$normalizedTransitions[$key] = $transition;
|
||||
}
|
||||
|
||||
return $transitions;
|
||||
return $normalizedTransitions;
|
||||
})
|
||||
->end()
|
||||
->isRequired()
|
||||
@@ -552,6 +541,7 @@ class Configuration implements ConfigurationInterface
|
||||
->example('is_fully_authenticated() and is_granted(\'ROLE_JOURNALIST\') and subject.getTitle() == \'My first article\'')
|
||||
->end()
|
||||
->arrayNode('from')
|
||||
->performNoDeepMerging()
|
||||
->beforeNormalization()
|
||||
->ifString()
|
||||
->then(fn ($v) => [$v])
|
||||
@@ -562,6 +552,7 @@ class Configuration implements ConfigurationInterface
|
||||
->end()
|
||||
->end()
|
||||
->arrayNode('to')
|
||||
->performNoDeepMerging()
|
||||
->beforeNormalization()
|
||||
->ifString()
|
||||
->then(fn ($v) => [$v])
|
||||
@@ -1866,6 +1857,7 @@ class Configuration implements ConfigurationInterface
|
||||
->end()
|
||||
->arrayNode('vars')
|
||||
->info('Associative array: the default vars used to expand the templated URI.')
|
||||
->useAttributeAsKey('name')
|
||||
->normalizeKeys(false)
|
||||
->variablePrototype()->end()
|
||||
->end()
|
||||
@@ -1946,6 +1938,7 @@ class Configuration implements ConfigurationInterface
|
||||
->end()
|
||||
->arrayNode('extra')
|
||||
->info('Extra options for specific HTTP client')
|
||||
->useAttributeAsKey('name')
|
||||
->normalizeKeys(false)
|
||||
->variablePrototype()->end()
|
||||
->end()
|
||||
@@ -2097,6 +2090,7 @@ class Configuration implements ConfigurationInterface
|
||||
->end()
|
||||
->arrayNode('extra')
|
||||
->info('Extra options for specific HTTP client')
|
||||
->useAttributeAsKey('name')
|
||||
->normalizeKeys(false)
|
||||
->variablePrototype()->end()
|
||||
->end()
|
||||
|
||||
@@ -163,6 +163,7 @@ use Symfony\Component\Serializer\Encoder\EncoderInterface;
|
||||
use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
|
||||
use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
|
||||
use Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader;
|
||||
use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
|
||||
use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
|
||||
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
|
||||
use Symfony\Component\Serializer\Serializer;
|
||||
@@ -920,11 +921,11 @@ class FrameworkExtension extends Extension
|
||||
$container->getDefinition('profiler_listener')
|
||||
->addArgument($config['collect_parameter']);
|
||||
|
||||
if (!$container->getParameter('kernel.debug') || !class_exists(CliRequest::class) || !$container->has('debug.stopwatch')) {
|
||||
if (!$container->getParameter('kernel.debug') || !$this->hasConsole() || !$container->has('debug.stopwatch') || !class_exists(CliRequest::class)) {
|
||||
$container->removeDefinition('console_profiler_listener');
|
||||
}
|
||||
|
||||
if (!class_exists(CommandDataCollector::class)) {
|
||||
if (!$this->hasConsole() || !class_exists(CommandDataCollector::class)) {
|
||||
$container->removeDefinition('.data_collector.command');
|
||||
}
|
||||
}
|
||||
@@ -972,16 +973,16 @@ class FrameworkExtension extends Extension
|
||||
$transitionCounter = 0;
|
||||
foreach ($workflow['transitions'] as $transition) {
|
||||
if ('workflow' === $type) {
|
||||
$transitionDefinition = new Definition(Workflow\Transition::class, [$transition['name'], $transition['from'], $transition['to']]);
|
||||
$transitionId = \sprintf('.%s.transition.%s', $workflowId, $transitionCounter++);
|
||||
$container->setDefinition($transitionId, $transitionDefinition);
|
||||
$container->register($transitionId, Workflow\Transition::class)
|
||||
->setArguments([$transition['name'], $transition['from'], $transition['to']]);
|
||||
$transitions[] = new Reference($transitionId);
|
||||
if (isset($transition['guard'])) {
|
||||
$configuration = new Definition(Workflow\EventListener\GuardExpression::class);
|
||||
$configuration->addArgument(new Reference($transitionId));
|
||||
$configuration->addArgument($transition['guard']);
|
||||
$eventName = \sprintf('workflow.%s.guard.%s', $name, $transition['name']);
|
||||
$guardsConfiguration[$eventName][] = $configuration;
|
||||
$guardsConfiguration[$eventName][] = new Definition(
|
||||
Workflow\EventListener\GuardExpression::class,
|
||||
[new Reference($transitionId), $transition['guard']]
|
||||
);
|
||||
}
|
||||
if ($transition['metadata']) {
|
||||
$transitionsMetadataDefinition->addMethodCall('offsetSet', [
|
||||
@@ -992,16 +993,16 @@ class FrameworkExtension extends Extension
|
||||
} elseif ('state_machine' === $type) {
|
||||
foreach ($transition['from'] as $from) {
|
||||
foreach ($transition['to'] as $to) {
|
||||
$transitionDefinition = new Definition(Workflow\Transition::class, [$transition['name'], $from, $to]);
|
||||
$transitionId = \sprintf('.%s.transition.%s', $workflowId, $transitionCounter++);
|
||||
$container->setDefinition($transitionId, $transitionDefinition);
|
||||
$container->register($transitionId, Workflow\Transition::class)
|
||||
->setArguments([$transition['name'], $from, $to]);
|
||||
$transitions[] = new Reference($transitionId);
|
||||
if (isset($transition['guard'])) {
|
||||
$configuration = new Definition(Workflow\EventListener\GuardExpression::class);
|
||||
$configuration->addArgument(new Reference($transitionId));
|
||||
$configuration->addArgument($transition['guard']);
|
||||
$eventName = \sprintf('workflow.%s.guard.%s', $name, $transition['name']);
|
||||
$guardsConfiguration[$eventName][] = $configuration;
|
||||
$guardsConfiguration[$eventName][] = new Definition(
|
||||
Workflow\EventListener\GuardExpression::class,
|
||||
[new Reference($transitionId), $transition['guard']]
|
||||
);
|
||||
}
|
||||
if ($transition['metadata']) {
|
||||
$transitionsMetadataDefinition->addMethodCall('offsetSet', [
|
||||
@@ -1622,11 +1623,11 @@ class FrameworkExtension extends Extension
|
||||
|
||||
foreach ($config['providers'] as $provider) {
|
||||
if ($provider['locales']) {
|
||||
$locales += $provider['locales'];
|
||||
$locales = array_merge($locales, $provider['locales']);
|
||||
}
|
||||
}
|
||||
|
||||
$locales = array_unique($locales);
|
||||
$locales = array_values(array_unique($locales));
|
||||
|
||||
$container->getDefinition('console.command.translation_pull')
|
||||
->replaceArgument(4, array_merge($transPaths, [$config['default_path']]))
|
||||
@@ -1954,7 +1955,7 @@ class FrameworkExtension extends Extension
|
||||
if (isset($config['enable_attributes']) && $config['enable_attributes']) {
|
||||
$annotationLoader = new Definition(
|
||||
AttributeLoader::class,
|
||||
[new Reference('annotation_reader', ContainerInterface::NULL_ON_INVALID_REFERENCE)]
|
||||
interface_exists(CacheableSupportsMethodInterface::class) ? [new Reference('annotation_reader', ContainerInterface::NULL_ON_INVALID_REFERENCE)] : [],
|
||||
);
|
||||
|
||||
$serializerLoaders[] = $annotationLoader;
|
||||
|
||||
Reference in New Issue
Block a user