diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 678698f4d..4d494eed0 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -250,6 +250,7 @@ private function addFormSection(ArrayNodeDefinition $rootNode, callable $enableI
->scalarNode('field_name')->defaultValue('_token')->end()
->arrayNode('field_attr')
->performNoDeepMerging()
+ ->normalizeKeys(false)
->scalarPrototype()->end()
->defaultValue(['data-controller' => 'csrf-protection'])
->end()
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
index 556a0cff6..bd27c27a6 100644
--- a/DependencyInjection/FrameworkExtension.php
+++ b/DependencyInjection/FrameworkExtension.php
@@ -615,7 +615,7 @@ public function load(array $configs, ContainerBuilder $container): void
$container->registerForAutoconfiguration(DataCollectorInterface::class)
->addTag('data_collector');
$container->registerForAutoconfiguration(FormTypeInterface::class)
- ->addTag('form.type');
+ ->addTag('form.type', ['csrf_token_id' => '%.form.type_extension.csrf.token_id%']);
$container->registerForAutoconfiguration(FormTypeGuesserInterface::class)
->addTag('form.type_guesser');
$container->registerForAutoconfiguration(FormTypeExtensionInterface::class)
@@ -777,9 +777,7 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont
$container->setParameter('form.type_extension.csrf.enabled', true);
$container->setParameter('form.type_extension.csrf.field_name', $config['form']['csrf_protection']['field_name']);
$container->setParameter('form.type_extension.csrf.field_attr', $config['form']['csrf_protection']['field_attr']);
-
- $container->getDefinition('form.type_extension.csrf')
- ->replaceArgument(7, $config['form']['csrf_protection']['token_id']);
+ $container->setParameter('.form.type_extension.csrf.token_id', $config['form']['csrf_protection']['token_id']);
} else {
$container->setParameter('form.type_extension.csrf.enabled', false);
}
@@ -2258,13 +2256,17 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
$transportRateLimiterReferences = [];
foreach ($config['transports'] as $name => $transport) {
$serializerId = $transport['serializer'] ?? 'messenger.default_serializer';
+ $tags = [
+ 'alias' => $name,
+ 'is_failure_transport' => \in_array($name, $failureTransports, true),
+ ];
+ if (str_starts_with($transport['dsn'], 'sync://')) {
+ $tags['is_consumable'] = false;
+ }
$transportDefinition = (new Definition(TransportInterface::class))
->setFactory([new Reference('messenger.transport_factory'), 'createTransport'])
->setArguments([$transport['dsn'], $transport['options'] + ['transport_name' => $name], new Reference($serializerId)])
- ->addTag('messenger.receiver', [
- 'alias' => $name,
- 'is_failure_transport' => \in_array($name, $failureTransports, true),
- ])
+ ->addTag('messenger.receiver', $tags)
;
$container->setDefinition($transportId = 'messenger.transport.'.$name, $transportDefinition);
$senderAliases[$name] = $transportId;
@@ -2668,7 +2670,6 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
}
$transports = $config['dsn'] ? ['main' => $config['dsn']] : $config['transports'];
$container->getDefinition('mailer.transports')->setArgument(0, $transports);
- $container->getDefinition('mailer.default_transport')->setArgument(0, current($transports));
$mailer = $container->getDefinition('mailer.mailer');
if (false === $messageBus = $config['message_bus']) {
diff --git a/Resources/config/form_csrf.php b/Resources/config/form_csrf.php
index c63d087c8..a86bb7c60 100644
--- a/Resources/config/form_csrf.php
+++ b/Resources/config/form_csrf.php
@@ -24,7 +24,7 @@
param('validator.translation_domain'),
service('form.server_params'),
param('form.type_extension.csrf.field_attr'),
- abstract_arg('framework.form.csrf_protection.token_id'),
+ param('.form.type_extension.csrf.token_id'),
])
->tag('form.type_extension')
;
diff --git a/Resources/config/mailer.php b/Resources/config/mailer.php
index 9eb545ca2..7a3a95739 100644
--- a/Resources/config/mailer.php
+++ b/Resources/config/mailer.php
@@ -46,10 +46,7 @@
])
->set('mailer.default_transport', TransportInterface::class)
- ->factory([service('mailer.transport_factory'), 'fromString'])
- ->args([
- abstract_arg('env(MAILER_DSN)'),
- ])
+ ->alias('mailer.default_transport', 'mailer.transports')
->alias(TransportInterface::class, 'mailer.default_transport')
->set('mailer.messenger.message_handler', MessageHandler::class)
diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
index 53706d2e0..6f3363f39 100644
--- a/Tests/DependencyInjection/ConfigurationTest.php
+++ b/Tests/DependencyInjection/ConfigurationTest.php
@@ -699,6 +699,22 @@ public function testSerializerJsonDetailedErrorMessagesNotSetByDefaultWithDebugD
$this->assertSame([], $config['serializer']['default_context'] ?? []);
}
+ public function testFormCsrfProtectionFieldAttrDoNotNormalizeKeys()
+ {
+ $processor = new Processor();
+ $config = $processor->processConfiguration(new Configuration(false), [
+ [
+ 'form' => [
+ 'csrf_protection' => [
+ 'field_attr' => ['data-example-attr' => 'value'],
+ ],
+ ],
+ ],
+ ]);
+
+ $this->assertSame(['data-example-attr' => 'value'], $config['form']['csrf_protection']['field_attr'] ?? []);
+ }
+
protected static function getBundleDefaultConfig()
{
return [
diff --git a/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/Tests/DependencyInjection/FrameworkExtensionTestCase.php
index 37cdc4cf6..5f5f41801 100644
--- a/Tests/DependencyInjection/FrameworkExtensionTestCase.php
+++ b/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -2105,8 +2105,7 @@ public function testMailer(string $configFile, array $expectedTransports, array
$this->assertTrue($container->hasAlias('mailer'));
$this->assertTrue($container->hasDefinition('mailer.transports'));
$this->assertSame($expectedTransports, $container->getDefinition('mailer.transports')->getArgument(0));
- $this->assertTrue($container->hasDefinition('mailer.default_transport'));
- $this->assertSame(current($expectedTransports), $container->getDefinition('mailer.default_transport')->getArgument(0));
+ $this->assertTrue($container->hasAlias('mailer.default_transport'));
$this->assertTrue($container->hasDefinition('mailer.envelope_listener'));
$l = $container->getDefinition('mailer.envelope_listener');
$this->assertSame('sender@example.org', $l->getArgument(0));
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy