apply individual error ID logic to all templates for better maintainability

jeanfrancois-morin · jeanfrancois-morin · commit d5cafa20bbb6 · 2025-09-18T20:11:46.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
@@ -183,9 +183,9 @@
 {% block form_errors -%}
     {% if errors|length > 0 -%}
     {% if form is not rootform %}<span class="help-block">{% else %}<div class="alert alert-danger">{% endif %}
-    <ul class="list-unstyled" id="{{ id ~ "_errors" }}">
+    <ul class="list-unstyled">
         {%- for error in errors -%}
-            <li><span class="glyphicon glyphicon-exclamation-sign"></span> {{ error.message }}</li>
+            <li id="{{ id ~ '_error' ~ loop.index }}"><span class="glyphicon glyphicon-exclamation-sign"></span> {{ error.message }}</li>
         {%- endfor -%}
     </ul>
     {% if form is not rootform %}</span>{% else %}</div>{% endif %}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig
@@ -26,7 +26,7 @@ col-sm-2
     {%- else -%}
     {%- set attr = {} -%}
     {%- if help -%}
-        {%- set attr = attr|merge({'aria-describedby': id ~"_help"}) -%}
+        {%- set attr = attr|merge({'aria-describedby': id ~ '_help'}) -%}
     {%- endif -%}
     {%- if errors|length > 0 -%}
         {%- set attr = attr|merge({'aria-invalid': 'true'}) -%}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
@@ -284,7 +284,7 @@
     {%- endif -%}
     {%- set attr = {} -%}
     {%- if help -%}
-        {%- set attr = attr|merge({'aria-describedby': id ~'_help'}) -%}
+        {%- set attr = attr|merge({'aria-describedby': id ~ '_help'}) -%}
     {%- endif -%}
     {%- if errors|length > 0 -%}
         {%- set attr = attr|merge({'aria-invalid': 'true'}) -%}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_5_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_5_layout.html.twig
@@ -320,25 +320,6 @@
 
 {# Rows #}
 
-{%- block form_row -%}
-    {%- set attr = {} -%}
-    {%- set aria_describedby = [] -%}
-    {%- if help -%}
-        {%- set aria_describedby = aria_describedby|merge([id ~ "_help"]) -%}
-    {%- endif -%}
-    {%- if errors|length > 0 -%}
-        {%- set aria_describedby = aria_describedby|merge(errors|map((error, index) => id ~ "_error" ~ (index+1))) -%}
-    {%- endif -%}
-    {%- if aria_describedby|length > 0 -%}
-        {%- set attr = attr|merge({'aria-describedby': aria_describedby|join(' ')}) -%}
-    {%- endif -%}
-    {%- if errors|length > 0 -%}
-        {%- set attr = attr|merge({'aria-invalid': 'true'}) -%}
-    {%- endif -%}
-    {%- set widget_attr = {attr: attr} -%}
-    {{- block('form_row_render') -}}
-{%- endblock form_row -%}
-
 {%- block form_row_render -%}
     {%- if compound is defined and compound -%}
         {%- set element = 'fieldset' -%}
@@ -368,7 +349,7 @@
 {%- block form_errors -%}
     {%- if errors|length > 0 -%}
         {%- for error in errors -%}
-            <div class="{% if form is not rootform %}invalid-feedback{% else %}alert alert-danger{% endif %} d-block" id="{{ id ~ "_error" ~ loop.index }}">{{ error.message }}</div>
+            <div class="{% if form is not rootform %}invalid-feedback{% else %}alert alert-danger{% endif %} d-block" id="{{ id ~ '_error' ~ loop.index }}">{{ error.message }}</div>
         {%- endfor -%}
     {%- endif %}
 {%- endblock form_errors %}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -347,10 +347,10 @@
     {%- set attr = {} -%}
     {%- set aria_describedby = [] -%}
     {%- if help -%}
-        {%- set aria_describedby = aria_describedby|merge([id ~ "_help"]) -%}
+        {%- set aria_describedby = aria_describedby|merge([id ~ '_help']) -%}
     {%- endif -%}
     {%- if errors|length > 0 -%}
-        {%- set aria_describedby = aria_describedby|merge([id ~ "_errors"]) -%}
+        {%- set aria_describedby = aria_describedby|merge(errors|map((_, index) => id ~ '_error' ~ (index + 1))) -%}
     {%- endif -%}
     {%- if aria_describedby|length > 0 -%}
         {%- set attr = attr|merge({'aria-describedby': aria_describedby|join(' ')}) -%}
@@ -412,9 +412,9 @@
 
 {%- block form_errors -%}
     {%- if errors|length > 0 -%}
-    <ul id="{{ id ~ "_errors" }}">
+    <ul>
         {%- for error in errors -%}
-            <li>{{ error.message }}</li>
+            <li id="{{ id ~ '_error' ~ loop.index }}">{{ error.message }}</li>
         {%- endfor -%}
     </ul>
     {%- endif -%}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig
@@ -336,10 +336,9 @@
 
 {% block form_errors -%}
     {% if errors|length > 0 -%}
-        {% if form is not rootform %}<small class="error" id="{{ id ~ "_errors" }}">{% else %}<div data-alert class="alert-box alert" id="{{ id ~ "_errors" }}">{% endif %}
+        {% if form is not rootform %}<small class="error">{% else %}<div data-alert class="alert-box alert">{% endif %}
         {%- for error in errors -%}
-            {{ error.message }}
-            {% if not loop.last %}, {% endif %}
+            <span id="{{ id ~ '_error' ~ loop.index }}">{{ error.message }}</span>{% if not loop.last %}, {% endif %}
         {%- endfor -%}
         {% if form is not rootform %}</small>{% else %}</div>{% endif %}
     {%- endif %}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/tailwind_2_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/tailwind_2_layout.html.twig
@@ -22,9 +22,9 @@
 
 {%- block form_errors -%}
     {%- if errors|length > 0 -%}
-        <ul id="{{ id ~ "_errors" }}">
+        <ul>
             {%- for error in errors -%}
-                <li class="{{ error_item_class|default('text-red-700') }}">{{ error.message }}</li>
+                <li class="{{ error_item_class|default('text-red-700') }}" id="{{ id ~ '_error' ~ loop.index }}">{{ error.message }}</li>
             {%- endfor -%}
         </ul>
     {%- endif -%}
