render errors as part of the label only

xabbuh · xabbuh · commit b2e50bb13e14 · 2018-11-13T10:49:00.000+01:00
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
@@ -207,11 +207,11 @@
                 {% set label = name|humanize %}
             {%- endif -%}
         {%- endif -%}
-        <{{ element|default('label') }}{% if label_attr %}{% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}{% endif %}>{{ translation_domain is same as(false) ? label : label|trans({}, translation_domain) }}{% block form_label_errors %}{{- form_errors(form) -}}{% endblock form_label_errors %}</{{ element|default('label') }}>
+        <{{ element|default('label') }}{% if label_attr %}{% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}{% endif %}>{{ translation_domain is same as(false) ? label : label|trans({}, translation_domain) }}{% block form_label_errors %}{{- form_errors(form, _context|merge({'render_errors': true})) -}}{% endblock form_label_errors %}</{{ element|default('label') }}>
     {%- else -%}
         {%- if errors|length > 0 -%}
         <div id="{{ id }}_errors" class="mb-2">
-            {{- form_errors(form) -}}
+            {{- form_errors(form, _context|merge({'render_errors': true})) -}}
         </div>
         {%- endif -%}
     {%- endif -%}
@@ -250,7 +250,7 @@
         {{ widget|raw }}
         <label{% for attrname, attrvalue in label_attr %} {{ attrname }}="{{ attrvalue }}"{% endfor %}>
             {{- label is not same as(false) ? (translation_domain is same as(false) ? label : label|trans({}, translation_domain)) -}}
-            {{- form_errors(form) -}}
+            {{- form_errors(form, _context|merge({'render_errors': true})) -}}
         </label>
     {%- endif -%}
 {%- endblock checkbox_radio_label %}
@@ -270,7 +270,7 @@
 {# Errors #}
 
 {% block form_errors -%}
-    {%- if errors|length > 0 -%}
+    {%- if render_errors|default(false) and errors|length > 0 -%}
         <span class="{% if form is not rootform %}invalid-feedback{% else %}alert alert-danger{% endif %} d-block">
             {%- for error in errors -%}
                 <span class="d-block">
