Merge branch '4.x' into 5.x

* 4.x:
  Add tests
  Render HTML attributes on form fieldset wrapper

Author: javiereguiluz

templates/crud/form_theme.html.twig

@@ -564,7 +564,7 @@
     {% set fieldset_has_errors = form.vars.ea_vars.field.getCustomOption(fieldset_error_count_option_name)|default(0) > 0 %}
     {% set is_collapsed = form.vars.ea_vars.field.getCustomOption(collapsed_option_name)|default(false) %}
 
-    <div class="form-fieldset {{ not fieldset_has_header ? 'form-fieldset-no-header' }} {{ fieldset_has_errors ? 'has-fieldset-error' }} {{ ea_css_class }}">
+    <div class="form-fieldset {{ not fieldset_has_header ? 'form-fieldset-no-header' }} {{ fieldset_has_errors ? 'has-fieldset-error' }} {{ ea_css_class }} {{ form.vars.attr.class|default('') }}" {% for key, value in form.vars.attr %}{% if key != 'class' %}{{ key }}="{{ value|e('html') }}" {% endif %}{% endfor %}>
         <fieldset>
             {% if fieldset_has_header %}
                 {{ form_label(form) }}

tests/Functional/Apps/DefaultApp/src/Controller/Synthetic/FormFieldsetHtmlAttributesCrudController.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace EasyCorp\Bundle\EasyAdminBundle\Tests\Functional\Apps\DefaultApp\Controller\Synthetic;
+
+use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
+use EasyCorp\Bundle\EasyAdminBundle\Field\FormField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\IdField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
+use EasyCorp\Bundle\EasyAdminBundle\Tests\Functional\Apps\DefaultApp\Entity\Synthetic\FormTestEntity;
+
+/**
+ * @extends AbstractCrudController<FormTestEntity>
+ */
+class FormFieldsetHtmlAttributesCrudController extends AbstractCrudController
+{
+    public static function getEntityFqcn(): string
+    {
+        return FormTestEntity::class;
+    }
+
+    public function configureFields(string $pageName): iterable
+    {
+        yield IdField::new('id')->hideOnForm();
+
+        yield FormField::addFieldset('Fieldset With Html Attribute')
+            ->setHtmlAttribute('data-foo', 'bar')
+            ->setHtmlAttribute('class', 'custom-fieldset-class');
+        yield TextField::new('name');
+
+        yield FormField::addFieldset('Fieldset With Form Type Options')
+            ->setFormTypeOptions(['attr' => ['data-baz' => 'qux']]);
+        yield TextField::new('description');
+    }
+}

tests/Functional/FormLayout/FormFieldsetHtmlAttributesTest.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace EasyCorp\Bundle\EasyAdminBundle\Tests\Functional\FormLayout;
+
+use EasyCorp\Bundle\EasyAdminBundle\Test\AbstractCrudTestCase;
+use EasyCorp\Bundle\EasyAdminBundle\Tests\Functional\Apps\DefaultApp\Controller\DashboardController;
+use EasyCorp\Bundle\EasyAdminBundle\Tests\Functional\Apps\DefaultApp\Controller\Synthetic\FormFieldsetHtmlAttributesCrudController;
+
+/**
+ * Regression test for #6285 / PR #7593: HTML attributes set via
+ * setHtmlAttribute() or setFormTypeOptions(['attr' => ...]) on a fieldset
+ * must reach the rendered .form-fieldset wrapper div.
+ */
+class FormFieldsetHtmlAttributesTest extends AbstractCrudTestCase
+{
+    protected function getControllerFqcn(): string
+    {
+        return FormFieldsetHtmlAttributesCrudController::class;
+    }
+
+    protected function getDashboardFqcn(): string
+    {
+        return DashboardController::class;
+    }
+
+    public function testSetHtmlAttributeIsRenderedOnFieldsetWrapper(): void
+    {
+        $crawler = $this->client->request('GET', $this->generateNewFormUrl());
+
+        $fieldset = $crawler->filter('.form-fieldset[data-foo="bar"]');
+
+        static::assertCount(1, $fieldset, 'Custom data-* attribute set via setHtmlAttribute() should be rendered on the .form-fieldset wrapper');
+        static::assertStringContainsString('custom-fieldset-class', $fieldset->attr('class'), 'Custom class set via setHtmlAttribute() should be merged into the wrapper class list');
+        static::assertStringContainsString('form-fieldset', $fieldset->attr('class'), 'The default form-fieldset class must be preserved alongside the custom class');
+    }
+
+    public function testSetFormTypeOptionsAttrIsRenderedOnFieldsetWrapper(): void
+    {
+        $crawler = $this->client->request('GET', $this->generateNewFormUrl());
+
+        static::assertCount(
+            1,
+            $crawler->filter('.form-fieldset[data-baz="qux"]'),
+            'Custom attribute set via setFormTypeOptions([\'attr\' => ...]) should be rendered on the .form-fieldset wrapper'
+        );
+    }
+}