Remove hard coded _token field

src/Sylius/Bundle/AdminBundle/templates/catalog_promotion/form.html.twig

@@ -8,7 +8,6 @@
         <input type="hidden" name="_method" value="{{ hookable_metadata.configuration.method }}" />
     {% endif %}
     {{ form_errors(form) }}
-    {{ form_widget(form._token) }}
 
     {% hook 'form' with { form } %}
 

src/Sylius/Bundle/AdminBundle/templates/channel/form.html.twig

@@ -8,7 +8,6 @@
         <input type="hidden" name="_method" value="{{ hookable_metadata.configuration.method }}" />
     {% endif %}
     {{ form_errors(form) }}
-    {{ form_widget(form._token) }}
 
     {% hook 'form' with { form } %}
     {{ form_end(form, {render_rest: false}) }}

src/Sylius/Bundle/AdminBundle/templates/country/form.html.twig

@@ -6,7 +6,6 @@
         <input type="hidden" name="_method" value="{{ hookable_metadata.configuration.method }}" />
     {% endif %}
     {{ form_errors(form) }}
-    {{ form_widget(form._token) }}
 
     {% hook 'form' with { form } %}
 

src/Sylius/Bundle/AdminBundle/templates/order/form.html.twig

@@ -8,7 +8,6 @@
         <input type="hidden" name="_method" value="{{ hookable_metadata.configuration.method }}" />
     {% endif %}
     {{ form_errors(form) }}
-    {{ form_widget(form._token) }}
 
     {% hook 'form' with { form } %}
 

src/Sylius/Bundle/AdminBundle/templates/payment_method/form.html.twig

@@ -10,7 +10,6 @@
         <input type="hidden" name="_method" value="{{ configuration.method }}" />
     {% endif %}
     {{ form_errors(form) }}
-    {{ form_widget(form._token) }}
 
     {% hook 'form' with { form } %}
 

src/Sylius/Bundle/AdminBundle/templates/product/form.html.twig

@@ -9,7 +9,6 @@
                 <input type="hidden" name="_method" value="{{ hookable_metadata.configuration.method }}" />
             {% endif %}
             {{ form_errors(form) }}
-            {{ form_widget(form._token) }}
 
             {% hook 'form' with {
                 mapped_product_attributes,

src/Sylius/Bundle/AdminBundle/templates/product/generate_variants/form.html.twig

@@ -8,7 +8,6 @@
         <input type="hidden" name="_method" value="{{ hookable_metadata.configuration.method }}" />
     {% endif %}
     {{ form_errors(form) }}
-    {{ form_widget(form._token) }}
 
     {% hook 'form' with { form } %}
 

src/Sylius/Bundle/AdminBundle/templates/product_attribute/form.html.twig

@@ -9,7 +9,6 @@
         {% if hookable_metadata.configuration.method is defined %}
             <input type="hidden" name="_method" value="{{ hookable_metadata.configuration.method }}" />
         {% endif %}
-        {{ form_widget(form._token) }}
 
         {% hook 'form' with { form } %}
     </div>

src/Sylius/Bundle/AdminBundle/templates/product_option/form.html.twig

@@ -8,7 +8,6 @@
         <input type="hidden" name="_method" value="{{ hookable_metadata.configuration.method }}" />
     {% endif %}
     {{ form_errors(form) }}
-    {{ form_widget(form._token) }}
 
     {% hook 'form' with { form } %}
 

src/Sylius/Bundle/AdminBundle/templates/product_variant/form.html.twig

@@ -7,7 +7,6 @@
             <input type="hidden" name="_method" value="{{ hookable_metadata.configuration.method }}" />
         {% endif %}
         {{ form_errors(form, sylius_test_form_attribute('form-validation-errors')) }}
-        {{ form_widget(form._token) }}
 
         {% hook 'form' with { form, resource } %}
     </div>

src/Sylius/Bundle/AdminBundle/templates/promotion/form.html.twig

@@ -8,7 +8,6 @@
         <input type="hidden" name="_method" value="{{ hookable_metadata.configuration.method }}" />
     {% endif %}
     {{ form_errors(form) }}
-    {{ form_widget(form._token) }}
 
     {% hook 'form' with { form } %}
 

src/Sylius/Bundle/AdminBundle/templates/promotion_coupon/generate/form.html.twig

@@ -4,7 +4,6 @@
     {{ form_start(form, {'attr': {'novalidate': 'novalidate', 'id': form.vars.id}}) }}
     <div class="row">
         {{ form_errors(form) }}
-        {{ form_widget(form._token) }}
 
         {% hook 'form' with { form } %}
     </div>

src/Sylius/Bundle/AdminBundle/templates/security/request_password_reset/page/content/form.html.twig

@@ -4,5 +4,4 @@
 
 {{ form_start(form, {'action': path('sylius_admin_request_password_reset'), 'attr': {'class': 'ui large loadable form', 'novalidate': 'novalidate'}}) }}
     {% hook 'form' with { form } %}
-    {{ form_row(form._token) }}
 {{ form_end(form, {'render_rest': false}) }}

src/Sylius/Bundle/AdminBundle/templates/security/reset_password/page/content/form.html.twig

@@ -4,5 +4,4 @@
 
 {{ form_start(form, {'action': path('sylius_admin_password_reset', {'token': app.request.attributes.get('token')}), 'attr': {'class': 'ui large loadable form', 'novalidate': 'novalidate'}}) }}
     {% hook 'form' with { form } %}
-    {{ form_row(form._token) }}
 {{ form_end(form, {'render_rest': false}) }}

src/Sylius/Bundle/AdminBundle/templates/shared/crud/common/content/form.html.twig

@@ -17,7 +17,6 @@
             <input type="hidden" name="_method" value="PUT"/>
         {% endif %}
         {{ form_errors(form) }}
-        {{ form_widget(form._token) }}
 
         {% hook 'form' with { form, resource } %}
     </div>

src/Sylius/Bundle/AdminBundle/templates/shared/form_theme.html.twig

@@ -87,3 +87,12 @@
     {% set attr = attr|merge({'class': (attr.class|default('') ~ ' btn btn-outline-primary')|trim}) %}
     {{ parent() }}
 {%- endblock -%}
+
+{%- block form_end -%}
+        {% for child in form %}
+            {% if 'csrf_token' in child.vars.block_prefixes and child.rendered == false %}
+                {{ form_row(child) }}
+            {% endif %}
+        {% endfor %}
+    </form>
+{%- endblock form_end -%}

src/Sylius/Bundle/AdminBundle/templates/shipment/component/ship.html.twig

@@ -16,7 +16,6 @@
                 {{ 'sylius.ui.ship'|trans }}
             </button>
         </div>
-        {{ form_row(form._token) }}
         {{ form_end(form, {'render_rest': false}) }}
     </div>
 {% endif %}

src/Sylius/Bundle/AdminBundle/templates/shipping_method/form.html.twig

@@ -9,7 +9,6 @@
             <input type="hidden" name="_method" value="{{ hookable_metadata.configuration.method }}" />
         {% endif %}
         {{ form_errors(form) }}
-        {{ form_widget(form._token) }}
 
         {% hook 'form' with { form } %}
     </div>

src/Sylius/Bundle/AdminBundle/templates/taxon/sections/form.html.twig

@@ -8,7 +8,6 @@
         <input type="hidden" name="_method" value="{{ hookable_metadata.configuration.method }}" />
     {% endif %}
     {{ form_errors(form) }}
-    {{ form_widget(form._token) }}
 
     {% hook 'form' with { form } %}
 

src/Sylius/Bundle/AdminBundle/templates/zone/form.html.twig

@@ -8,7 +8,6 @@
         <input type="hidden" name="_method" value="{{ hookable_metadata.configuration.method }}" />
     {% endif %}
     {{ form_errors(form) }}
-    {{ form_widget(form._token) }}
 
     {% hook 'form' with { form } %}
 

src/Sylius/Bundle/ShopBundle/templates/account/address_book/common/main/form.html.twig

@@ -10,6 +10,5 @@
 
     {% hook 'form' with { form } %}
 
-    {{ form_row(form._token) }}
     {{ form_end(form, {'render_rest': false}) }}
 </div>

src/Sylius/Bundle/ShopBundle/templates/account/address_book/set_as_default.html.twig

@@ -1,9 +1,11 @@
 {% import '@SyliusShop/shared/buttons.html.twig' as buttons %}
+
+{% form_theme form '@SyliusShop/form/theme.html.twig' %}
+
 <div {{ attributes }}>
     {{ form_start(form, {'action': path('sylius_shop_account_address_book_set_as_default', {'id': hookable_metadata.context.address.id})}) }}
     <input type="hidden" name="_method" value="PATCH" />
     <input type="hidden" name={{ form.defaultAddress.vars['full_name'] }} value={{ hookable_metadata.context.address.id }} />
     {{ buttons.submit('sylius.ui.set_as_default'|trans, 'set-as-default-button', null, 'btn-sm btn-icon btn-outline-gray w-full') }}
-    {{ form_row(form._token) }}
     {{ form_end(form, {'render_rest': false}) }}
 </div>

src/Sylius/Bundle/ShopBundle/templates/account/change_password/update/content/main/form.html.twig

@@ -10,6 +10,5 @@
 
     {% hook 'form' with { form } %}
 
-    {{ form_row(form._token) }}
     {{ form_end(form, {'render_rest': false}) }}
 </div>

src/Sylius/Bundle/ShopBundle/templates/account/forgotten_password/content/form_container/form.html.twig

@@ -5,6 +5,5 @@
 <div>
     {{ form_start(form, {'action': path('sylius_shop_request_password_reset_token'), 'attr': {'novalidate': 'novalidate'}}) }}
     {% hook 'form' %}
-    {{ form_row(form._token) }}
     {{ form_end(form, {'render_rest': false}) }}
 </div>

src/Sylius/Bundle/ShopBundle/templates/account/profile_update/update/content/main/form.html.twig

@@ -3,7 +3,6 @@
 <div {{ attributes }}>
     {{ form_start(form, {'attr': {'class': 'ui loadable form', 'novalidate': 'novalidate'}}) }}
     {{ form_errors(form) }}
-    {{ form_row(form._token) }}
     <input type="hidden" name="_method" value="PUT" />
 
     {% hook 'form' with { form } %}

src/Sylius/Bundle/ShopBundle/templates/account/register/content/form.html.twig

@@ -2,7 +2,6 @@
 
 <div {{ attributes }}>
     {{ form_start(form, {'action': path('sylius_shop_register'), 'attr': {'class': 'ui loadable form', 'novalidate': 'novalidate', 'id': form.vars.id}}) }}
-    {{ form_row(form._token) }}
 
     {% hook 'form' with { form } %}
 

src/Sylius/Bundle/ShopBundle/templates/account/reset_password/content/form.html.twig

@@ -7,5 +7,4 @@
 
 {% hook 'form' %}
 
-{{ form_row(form._token) }}
 {{ form_end(form, {render_rest: hookable.configuration.render_rest|default(false)}) }}

src/Sylius/Bundle/ShopBundle/templates/cart/index/content/form.html.twig

@@ -11,7 +11,6 @@
         {{ form_start(form, {'action': path('sylius_shop_cart_checkout'), 'attr': {'novalidate': 'novalidate', 'id': form.vars.id}}) }}
         <input type="hidden" name="_method" value="PATCH"/>
         {{ form_errors(form) }}
-        {{ form_widget(form._token) }}
 
         {% hook 'form' with { form }  %}
 

src/Sylius/Bundle/ShopBundle/templates/checkout/address/content/form.html.twig

@@ -9,6 +9,5 @@
 
     {% hook 'form' with { form, order: resource, email_exists: emailExists } %}
 
-    {{ form_row(form._token) }}
     {{ form_end(form, {render_rest: hookable.configuration.render_rest|default(false)}) }}
 </div>

src/Sylius/Bundle/ShopBundle/templates/checkout/complete/content/form.html.twig

@@ -8,5 +8,4 @@
 
 {% hook 'form' %}
 
-{{ form_row(form._token) }}
 {{ form_end(form, {'render_rest': false}) }}

src/Sylius/Bundle/ShopBundle/templates/checkout/select_payment/content/form.html.twig

@@ -10,6 +10,5 @@
 
     {% hook 'form' with { form, order: resource } %}
 
-    {{ form_row(form._token) }}
     {{ form_end(form, {'render_rest': false}) }}
 </div>

src/Sylius/Bundle/ShopBundle/templates/checkout/select_shipping/content/form.html.twig

@@ -10,6 +10,5 @@
 
     {% hook 'form' %}
 
-    {{ form_row(form._token) }}
     {{ form_end(form, {'render_rest': false}) }}
 </div>

src/Sylius/Bundle/ShopBundle/templates/contact/contact_request/content/form.html.twig

@@ -2,5 +2,4 @@
 
 {{ form_start(form, {'action': path('sylius_shop_contact_request'), 'attr': {'novalidate': 'novalidate'}}) }}
 {% hook 'form' %}
-{{ form_row(form._token) }}
 {{ form_end(form, {'render_rest': false}) }}

src/Sylius/Bundle/ShopBundle/templates/form/theme.html.twig

@@ -73,3 +73,12 @@
         {% endfor %}
     </div>
 {% endblock %}
+
+{%- block form_end -%}
+    {% for child in form %}
+        {% if 'csrf_token' in child.vars.block_prefixes and child.rendered == false %}
+            {{ form_row(child) }}
+        {% endif %}
+    {% endfor %}
+    </form>
+{%- endblock form_end -%}

src/Sylius/Bundle/ShopBundle/templates/order/show/content/form.html.twig

@@ -12,7 +12,6 @@
 
     {% hook 'form' %}
 
-    {{ form_row(form._token) }}
     {{ form_end(form, {'render_rest': false}) }}
 {% else %}
     {{ messages.info('sylius.ui.you_can_no_longer_change_payment_method_of_this_order') }}

src/Sylius/Bundle/ShopBundle/templates/product/show/content/info/summary/add_to_cart.html.twig

@@ -15,7 +15,6 @@
 
             {% hook 'add_to_cart' with { product, form } %}
 
-            {{ form_row(form._token) }}
             {{ form_end(form, {'render_rest': false}) }}
         </div>
     {% endif %}

src/Sylius/Bundle/ShopBundle/templates/product_review/create/content/main/form.html.twig

@@ -11,6 +11,5 @@
 
     {{ form_errors(form) }}
 
-    {{ form_row(form._token) }}
     {{ form_end(form, {'render_rest': false}) }}
 </div>