[Twig][Bootstrap 4 Theme]: Displaying errors like in official components/forms

FlashBlack · FlashBlack · commit f506da27c678 · 2019-01-25T21:53:16.000+03:00
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
@@ -33,6 +33,7 @@ col-sm-2
             <div class="{{ block('form_group_class') }}">
                 {{- form_widget(form, widget_attr) -}}
                 {{- form_help(form) -}}
+                {{- form_errors(form) -}}
             </div>
     {##}</div>
     {%- endif -%}
@@ -49,6 +50,7 @@ col-sm-2
             <div class="{{ block('form_group_class') }}">
                 {{- form_widget(form, widget_attr) -}}
                 {{- form_help(form) -}}
+                {{- form_errors(form) -}}
             </div>
         </div>
 {##}</fieldset>
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
@@ -219,7 +219,7 @@
                 {% 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) }}</{{ element|default('label') }}>
     {%- else -%}
         {%- if errors|length > 0 -%}
         <div id="{{ id }}_errors" class="mb-2">
@@ -281,20 +281,21 @@
         {{- form_label(form) -}}
         {{- form_widget(form, widget_attr) -}}
         {{- form_help(form) -}}
+        {{- form_errors(form) -}}
     </{{ element|default('div') }}>
 {%- endblock form_row %}
 
 {# Errors #}
 
 {% block form_errors -%}
     {%- if errors|length > 0 -%}
-        <span class="{% if form is not rootform %}invalid-feedback{% else %}alert alert-danger{% endif %} d-block">
+        <div class="{% if form is not rootform %}invalid-feedback{% else %}alert alert-danger{% endif %} d-block">
             {%- for error in errors -%}
                 <span class="d-block">
-                    <span class="form-error-icon badge badge-danger text-uppercase">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span>
+                    <span class="form-error-message">{{ error.message }}</span>
                 </span>
             {%- endfor -%}
-        </span>
+        </div>
     {%- endif %}
 {%- endblock form_errors %}
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTest.php
@@ -32,7 +32,7 @@ public function testRow()
     [
         ./label[@for="name"]
         [
-            ./span[@class="alert alert-danger d-block"]
+            ./div[@class="alert alert-danger d-block"]
                 [./span[@class="d-block"]
                     [./span[.="[trans]Error[/trans]"]]
                     [./span[.="[trans]Error![/trans]"]]
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4LayoutTest.php
@@ -41,7 +41,7 @@ public function testRow()
     [
         ./label[@for="name"]
         [
-            ./span[@class="alert alert-danger d-block"]
+            ./div[@class="alert alert-danger d-block"]
                 [./span[@class="d-block"]
                     [./span[.="[trans]Error[/trans]"]]
                     [./span[.="[trans]Error![/trans]"]]
@@ -289,7 +289,7 @@ public function testErrors()
         $html = $this->renderErrors($view);
 
         $this->assertMatchesXpath($html,
-'/span
+'/div
     [@class="alert alert-danger d-block"]
     [
         ./span[@class="d-block"]

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function testRow()`
`32`	`32`	`[`
`33`	`33`	`./label[@for="name"]`
`34`	`34`	`[`
`35`		`- ./span[@class="alert alert-danger d-block"]`
	`35`	`+ ./div[@class="alert alert-danger d-block"]`
`36`	`36`	`[./span[@class="d-block"]`
`37`	`37`	`[./span[.="[trans]Error[/trans]"]]`
`38`	`38`	`[./span[.="[trans]Error![/trans]"]]`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function testRow()`
`41`	`41`	`[`
`42`	`42`	`./label[@for="name"]`
`43`	`43`	`[`
`44`		`- ./span[@class="alert alert-danger d-block"]`
	`44`	`+ ./div[@class="alert alert-danger d-block"]`
`45`	`45`	`[./span[@class="d-block"]`
`46`	`46`	`[./span[.="[trans]Error[/trans]"]]`
`47`	`47`	`[./span[.="[trans]Error![/trans]"]]`
`@@ -289,7 +289,7 @@ public function testErrors()`
`289`	`289`	`$html = $this->renderErrors($view);`
`290`	`290`
`291`	`291`	`$this->assertMatchesXpath($html,`
`292`		`-'/span`
	`292`	`+'/div`
`293`	`293`	`[@class="alert alert-danger d-block"]`
`294`	`294`	`[`
`295`	`295`	`./span[@class="d-block"]`