Merge branch '6.4' into 7.0

* 6.4: Fix implicit nullable parameters Remove whitespaces from block form_help Fix TypeError on ProgressBar
symfony · Mar 28, 2024 · 1d5745d · 1d5745d
2 parents d16aa4e + f150e06
commit 1d5745d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Resources/views/Form/bootstrap_5_layout.html.twig b/Resources/views/Form/bootstrap_5_layout.html.twig
@@ -361,12 +361,12 @@
 {# Help #}
 
 {%- block form_help -%}
-    {% set row_class = row_attr.class|default('') %}
-    {% set help_class = ' form-text' %}
-    {% if 'input-group' in row_class %}
+    {%- set row_class = row_attr.class|default('') -%}
+    {%- set help_class = ' form-text' -%}
+    {%- if 'input-group' in row_class -%}
         {#- Hack to properly display help with input group -#}
-        {% set help_class = ' input-group-text' %}
-    {% endif %}
+        {%- set help_class = ' input-group-text' -%}
+    {%- endif -%}
     {%- if help is not empty -%}
         {%- set help_attr = help_attr|merge({class: (help_attr.class|default('') ~ help_class ~ ' mb-0')|trim}) -%}
     {%- endif -%}