Merge branch '2.8' into 3.3

nicolas-grekas · nicolas-grekas · commit 1f2213a6910b · 2017-12-04T20:58:26.000+01:00
* 2.8:
  Fix for missing whitespace control modifier in form layout
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
@@ -337,7 +337,7 @@
         {% if not child.rendered %}
             {{- form_row(child) -}}
         {% endif %}
-    {%- endfor %}
+    {%- endfor -%}
 
     {% if not form.methodRendered and form is rootform %}
         {%- do form.setMethodRendered() -%}
@@ -351,7 +351,7 @@
         {%- if form_method != method -%}
             <input type="hidden" name="_method" value="{{ method }}" />
         {%- endif -%}
-    {% endif %}
+    {% endif -%}
 {% endblock form_rest %}
 
 {# Support #}
