From 63d8657a1b6a456bfe69c6f3de99813c151acab2 Mon Sep 17 00:00:00 2001
From: Stefano Sala <stefano.sala@spa.it>
Date: Mon, 7 Jul 2014 14:47:02 +0200
Subject: [PATCH] [Twig][Form] Moved twig.form.resources to a higher level

---
 cookbook/form/form_customization.rst | 28 +++++++++------------------
 reference/configuration/twig.rst     | 29 +++++++++++++++-------------
 2 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/cookbook/form/form_customization.rst b/cookbook/form/form_customization.rst
index fb36e4fc01f..358fab95a31 100644
--- a/cookbook/form/form_customization.rst
+++ b/cookbook/form/form_customization.rst
@@ -439,18 +439,15 @@ form is rendered.
 
         # app/config/config.yml
         twig:
-            form:
-                resources:
-                    - 'AcmeDemoBundle:Form:fields.html.twig'
+            form_themes:
+                - 'AcmeDemoBundle:Form:fields.html.twig'
             # ...
 
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
         <twig:config>
-            <twig:form>
-                <resource>AcmeDemoBundle:Form:fields.html.twig</resource>
-            </twig:form>
+            <twig:form-theme>AcmeDemoBundle:Form:fields.html.twig</twig:form-theme>
             <!-- ... -->
         </twig:config>
 
@@ -458,10 +455,8 @@ form is rendered.
 
         // app/config/config.php
         $container->loadFromExtension('twig', array(
-            'form' => array(
-                'resources' => array(
-                    'AcmeDemoBundle:Form:fields.html.twig',
-                ),
+            'form_themes' => array(
+                'AcmeDemoBundle:Form:fields.html.twig',
             ),
 
             // ...
@@ -477,17 +472,14 @@ resource to use such a layout:
 
         # app/config/config.yml
         twig:
-            form:
-                resources: ['form_table_layout.html.twig']
+            form_themes: ['form_table_layout.html.twig']
             # ...
 
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
         <twig:config>
-            <twig:form>
-                <resource>form_table_layout.html.twig</resource>
-            </twig:form>
+            <twig:form-theme>form_table_layout.html.twig</twig:form-theme>
             <!-- ... -->
         </twig:config>
 
@@ -495,10 +487,8 @@ resource to use such a layout:
 
         // app/config/config.php
         $container->loadFromExtension('twig', array(
-            'form' => array(
-                'resources' => array(
-                    'form_table_layout.html.twig',
-                ),
+            'form_themes' => array(
+                'form_table_layout.html.twig',
             ),
 
             // ...
diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst
index cdb3de3bd00..cd121710277 100644
--- a/reference/configuration/twig.rst
+++ b/reference/configuration/twig.rst
@@ -10,14 +10,13 @@ TwigBundle Configuration ("twig")
 
         twig:
             exception_controller:  twig.controller.exception:showAction
-            form:
-                resources:
+            form_themes:
 
-                    # Default:
-                    - form_div_layout.html.twig
+                # Default:
+                - form_div_layout.html.twig
 
-                    # Example:
-                    - MyBundle::form.html.twig
+                # Example:
+                - MyBundle::form.html.twig
             globals:
 
                 # Examples:
@@ -54,9 +53,8 @@ TwigBundle Configuration ("twig")
                                 http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/doctrine/twig-1.0.xsd">
 
             <twig:config auto-reload="%kernel.debug%" autoescape="true" base-template-class="Twig_Template" cache="%kernel.cache_dir%/twig" charset="%kernel.charset%" debug="%kernel.debug%" strict-variables="false">
-                <twig:form>
-                    <twig:resource>MyBundle::form.html.twig</twig:resource>
-                </twig:form>
+                <twig:form-theme>form_div_layout.html.twig</twig:form-theme> <!-- Default -->
+                <twig:form-theme>MyBundle::form.html.twig</twig:form-theme>
                 <twig:global key="foo" id="bar" type="service" />
                 <twig:global key="pi">3.14</twig:global>
             </twig:config>
@@ -65,10 +63,9 @@ TwigBundle Configuration ("twig")
     .. code-block:: php
 
         $container->loadFromExtension('twig', array(
-            'form' => array(
-                'resources' => array(
-                    'MyBundle::form.html.twig',
-                )
+            'form_themes' => array(
+                'form_div_layout.html.twig', // Default
+                'MyBundle::form.html.twig',
              ),
              'globals' => array(
                  'foo' => '@bar',
@@ -83,6 +80,12 @@ TwigBundle Configuration ("twig")
              'strict_variables'    => false,
         ));
 
+.. caution::
+
+    The ``twig.form`` (``<twig:form />`` tag for xml) configuration key
+    has been deprecated and will be removed in 3.0. Instead, use the ``twig.form_themes``
+    option.
+
 Configuration
 -------------
 

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/symfony/symfony-docs/pull/4003.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony-docs/pull/4003.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony-docs/pull/4003.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony-docs/pull/4003.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>