Merge branch '3.2' into 3.3

* 3.2: (42 commits)
  Show exception is checked twice in ExceptionController of twig
  allow SSI fragments configuration in XML files
  Display a better error message when the toolbar cannot be displayed
  render hidden _method field in form_rest()
  Add Doctrine Cache to dev dependencies to fix failing unit tests.
  return fallback locales whenever possible
  [Console] Fix catching exception type in QuestionHelper
  [WebProfilerBundle] Eliminate line wrap on count columnt (routing)
  [Routing] Fix XmlFileLoader exception message
  [Translation] Fix FileLoader::loadResource() php doc
  Sessions: configurable "use_strict_mode" option for NativeSessionStorage
  [FrameworkBundle] [Command] Clean bundle directory, fixes #23177
  Reset redirectCount when throwing exception
  [TwigBundle] Remove template.xml services when templating is disabled
  add content-type header on exception response
  Embedding a response that combines expiration and validation, that should not defeat expiration on the combined response
  fixed bad merge
  Fix two edge cases in ResponseCacheStrategy
  [Routing] Expose request in route conditions, if needed and possible
  [Routing] Expose request in route conditions, if needed and possible
  ...

Resources/views/Form/form_div_layout.html.twig

@@ -302,6 +302,7 @@
 {%- endblock form -%}
 
 {%- block form_start -%}
+    {%- do form.setMethodRendered() -%}
     {% set method = method|upper %}
     {%- if method in ["GET", "POST"] -%}
         {% set form_method = method %}
@@ -337,6 +338,20 @@
             {{- form_row(child) -}}
         {% endif %}
     {%- endfor %}
+
+    {% if not form.methodRendered %}
+        {%- do form.setMethodRendered() -%}
+        {% set method = method|upper %}
+        {%- if method in ["GET", "POST"] -%}
+            {% set form_method = method %}
+        {%- else -%}
+            {% set form_method = "POST" %}
+        {%- endif -%}
+
+        {%- if form_method != method -%}
+            <input type="hidden" name="_method" value="{{ method }}" />
+        {%- endif -%}
+    {% endif %}
 {% endblock form_rest %}
 
 {# Support #}

composer.json

@@ -23,7 +23,7 @@
         "fig/link-util": "^1.0",
         "symfony/asset": "~2.8|~3.0",
         "symfony/finder": "~2.8|~3.0",
-        "symfony/form": "^3.2.7",
+        "symfony/form": "^3.2.10|^3.3.3",
         "symfony/http-kernel": "~3.2",
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/routing": "~2.8|~3.0",
@@ -38,6 +38,9 @@
         "symfony/expression-language": "~2.8|~3.0",
         "symfony/web-link": "~3.3"
     },
+    "conflict": {
+        "symfony/form": "<3.2.10|~3.3,<3.3.3"
+    },
     "suggest": {
         "symfony/finder": "",
         "symfony/asset": "For using the AssetExtension",