[FrameworkBundle] Fix declaring fiel-attr tags in xml config files

nicolas-grekas · nicolas-grekas · commit 88b322e144d3 · 2025-05-16T17:49:05.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -252,6 +252,7 @@ private function addFormSection(ArrayNodeDefinition $rootNode, callable $enableI
                                 ->arrayNode('field_attr')
                                     ->performNoDeepMerging()
                                     ->normalizeKeys(false)
+                                    ->useAttributeAsKey('name')
                                     ->scalarPrototype()->end()
                                     ->defaultValue(['data-controller' => 'csrf-protection'])
                                 ->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -79,7 +79,7 @@
         <xsd:attribute name="field-name" type="xsd:string" />
     </xsd:complexType>
 
-    <xsd:complexType name="field_attr">
+    <xsd:complexType name="field_attr" mixed="true">
         <xsd:attribute name="name" type="xsd:string" use="required"/>
     </xsd:complexType>
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/form_csrf_field_attr.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/form_csrf_field_attr.php
@@ -0,0 +1,22 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'annotations' => false,
+    'http_method_override' => false,
+    'handle_all_throwables' => true,
+    'php_errors' => ['log' => true],
+    'csrf_protection' => [
+        'enabled' => true,
+    ],
+    'form' => [
+        'csrf_protection' => [
+            'field-attr' => [
+                'data-foo' => 'bar',
+                'data-bar' => 'baz',
+            ],
+        ],
+    ],
+    'session' => [
+        'storage_factory_id' => 'session.storage.factory.native',
+    ],
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_field_attr.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_field_attr.xml
@@ -9,7 +9,13 @@
     <framework:config http-method-override="false" handle-all-throwables="true">
         <framework:annotations enabled="false" />
         <framework:php-errors log="true" />
-        <framework:csrf-protection field-name="_custom" />
+        <framework:csrf-protection enabled="true" />
+        <framework:form>
+            <framework:csrf-protection>
+                <framework:field-attr name="data-foo">bar</framework:field-attr>
+                <framework:field-attr name="data-bar">baz</framework:field-attr>
+            </framework:csrf-protection>
+        </framework:form>
         <framework:session storage-factory-id="session.storage.factory.native" />
     </framework:config>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_under_form_sets_field_name.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/form_csrf_under_form_sets_field_name.xml
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/form_csrf_field_attr.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/form_csrf_field_attr.yml
@@ -0,0 +1,16 @@
+framework:
+    annotations: false
+    http_method_override: false
+    handle_all_throwables: true
+    php_errors:
+        log: true
+    csrf_protection:
+        enabled: true
+    form:
+        csrf_protection:
+            enabled: true
+            field_attr:
+                data-foo: bar
+                data-bar: baz
+    session:
+        storage_factory_id: session.storage.factory.native
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -1413,6 +1413,17 @@ public function testFormsCanBeEnabledWithoutCsrfProtection()
         $this->assertFalse($container->getParameter('form.type_extension.csrf.enabled'));
     }
 
+    public function testFormCsrfFieldAttr()
+    {
+        $container = $this->createContainerFromFile('form_csrf_field_attr');
+
+        $expected = [
+            'data-foo' => 'bar',
+            'data-bar' => 'baz',
+        ];
+        $this->assertSame($expected, $container->getParameter('form.type_extension.csrf.field_attr'));
+    }
+
     public function testStopwatchEnabledWithDebugModeEnabled()
     {
         $container = $this->createContainerFromFile('default_config', [
