From b4c41d64182886551e15b216df9a545bfb7c2560 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Wed, 21 Jun 2017 18:08:25 +0200
Subject: [PATCH] render hidden _method field in form_rest()

---
 Resources/views/Form/form_div_layout.html.twig | 15 +++++++++++++++
 composer.json                                  |  5 ++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/Resources/views/Form/form_div_layout.html.twig b/Resources/views/Form/form_div_layout.html.twig
index 04988d15..0a52cc51 100644
--- a/Resources/views/Form/form_div_layout.html.twig
+++ b/Resources/views/Form/form_div_layout.html.twig
@@ -262,6 +262,7 @@
 {%- endblock form -%}
 
 {%- block form_start -%}
+    {%- do form.setMethodRendered() -%}
     {% set method = method|upper %}
     {%- if method in ["GET", "POST"] -%}
         {% set form_method = method %}
@@ -301,6 +302,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 #}
diff --git a/composer.json b/composer.json
index 3b6c4356..9610edc8 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
     "require-dev": {
         "symfony/asset": "~2.7",
         "symfony/finder": "~2.3",
-        "symfony/form": "~2.7.26|^2.8.19",
+        "symfony/form": "~2.7.30|^2.8.23",
         "symfony/http-kernel": "~2.3",
         "symfony/intl": "~2.3",
         "symfony/routing": "~2.2",
@@ -36,6 +36,9 @@
         "symfony/var-dumper": "~2.7.16|^2.8.9",
         "symfony/expression-language": "~2.4"
     },
+    "conflict": {
+        "symfony/form": "<2.7.30|~2.8,<2.8.23"
+    },
     "suggest": {
         "symfony/finder": "",
         "symfony/asset": "For using the AssetExtension",