composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 10:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.2' into develop

Browse Source
This commit is contained in:
lenaick.moreira
2026-03-02 10:56:31 +01:00
parent 52a1d8d626 fc967c06ce
commit ae633111c0
123 changed files with 2898 additions and 2149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/symfony/framework-bundle/DependencyInjection/Configuration.php
View File

@@ -494,6 +494,7 @@ class Configuration implements ConfigurationInterface
->cannotBeEmpty()
->end()
->arrayNode('metadata')
->useAttributeAsKey('key')
->normalizeKeys(false)
->defaultValue([])
->example(['color' => 'blue', 'description' => 'Workflow to manage article.'])
@@ -563,6 +564,7 @@ class Configuration implements ConfigurationInterface
->end()
->end()
->arrayNode('metadata')
->useAttributeAsKey('key')
->normalizeKeys(false)
->defaultValue([])
->example(['color' => 'blue', 'description' => 'Workflow to manage article.'])
@@ -573,6 +575,7 @@ class Configuration implements ConfigurationInterface
->end()
->end()
->arrayNode('metadata')
->useAttributeAsKey('key')
->normalizeKeys(false)
->defaultValue([])
->example(['color' => 'blue', 'description' => 'Workflow to manage article.'])
@@ -1186,6 +1189,7 @@ class Configuration implements ConfigurationInterface
->end()
->end()
->arrayNode('default_context')
->useAttributeAsKey('key')
->normalizeKeys(false)
->validate()
->ifTrue(fn () => $this->debug && class_exists(JsonParser::class))
@@ -1667,6 +1671,7 @@ class Configuration implements ConfigurationInterface
->scalarNode('dsn')->end()
->scalarNode('serializer')->defaultNull()->info('Service id of a custom serializer to use.')->end()
->arrayNode('options')
->useAttributeAsKey('key')
->normalizeKeys(false)
->defaultValue([])
->prototype('variable')

7
lib/symfony/framework-bundle/DependencyInjection/FrameworkExtension.php
View File

@@ -2101,6 +2101,10 @@ class FrameworkExtension extends Extension
private function registerSemaphoreConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
{
if (!class_exists(Semaphore::class)) {
throw new LogicException('Semaphore support cannot be enabled as the Semaphore component is not installed. Try running "composer require symfony/semaphore".');
}
$loader->load('semaphore.php');
foreach ($config['resources'] as $resourceName => $resourceStore) {
@@ -2395,7 +2399,8 @@ class FrameworkExtension extends Extension
$failureTransportsByTransportNameServiceLocator = ServiceLocatorTagPass::register($container, $failureTransportReferencesByTransportName);
$container->getDefinition('messenger.failure.send_failed_message_to_failure_transport_listener')
->replaceArgument(0, $failureTransportsByTransportNameServiceLocator);
->replaceArgument(0, $failureTransportsByTransportNameServiceLocator)
->replaceArgument(2, $failureTransportsByName);
} else {
$container->removeDefinition('messenger.failure.send_failed_message_to_failure_transport_listener');
$container->removeDefinition('console.command.messenger_failed_messages_retry');