Merge branch '2.0' into 2.1

Conflicts:
	reference/forms/twig_reference.rst

Author: weaverryan

cookbook/bundles/extension.rst

@@ -21,7 +21,7 @@ as integration of other related components:
 
         framework:
             # ...
-            form:            true
+            form: true
 
     .. code-block:: xml
 
@@ -33,7 +33,7 @@ as integration of other related components:
 
         $container->loadFromExtension('framework', array(
             // ...
-            'form'            => true,
+            'form' => true,
             // ...
         ));
 
@@ -548,9 +548,9 @@ When creating an extension, follow these simple conventions:
 * The extension should provide an XSD schema.
 
 If you follow these simple conventions, your extensions will be registered
-automatically by Symfony2. If not, override the Bundle
-:method:`Symfony\\Component\\HttpKernel\\Bundle\\Bundle::build` method in
-your bundle::
+automatically by Symfony2. If not, override the
+:method:`Bundle::build() <Symfony\\Component\\HttpKernel\\Bundle\\Bundle::build>`
+method in your bundle::
 
     // ...
     use Acme\HelloBundle\DependencyInjection\UnconventionalExtensionClass;

reference/constraints/DateTime.rst

@@ -64,7 +64,7 @@ Basic Usage
         {
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
-                $metadata->addPropertyConstraint('createdAt', new Assert\DataTime());
+                $metadata->addPropertyConstraint('createdAt', new Assert\DateTime());
             }
         }
 

reference/forms/twig_reference.rst

@@ -1,8 +1,23 @@
 .. index::
    single: Forms; Twig form function reference
 
-Twig Template Form Function Reference
-=====================================
+Twig Template Form Function and Variable Reference
+==================================================
+
+When working with forms in a template, there are two powerful things at your
+disposal:
+
+* :ref:`Functions<reference-form-twig-functions>` for rendering each part of a form
+* :ref:`Variables<twig-reference-form-variables>` for getting *any* information about any field
+
+You'll use functions often to render your fields. Variables, on the other
+hand, are less commonly-used, but infinitely powerful since you can access
+a fields label, id attribute, errors, and anything else about the field.
+
+.. _reference-form-twig-functions:
+
+Form Rendering Functions
+------------------------
 
 This reference manual covers all the possible Twig functions available for
 rendering forms. There are several different functions available, and each
@@ -114,8 +129,12 @@ good idea to include this in your form tag:
 
 .. _`twig-reference-form-variables`:
 
-More about Form "Variables"
----------------------------
+More about Form Variables
+-------------------------
+
+.. tip::
+
+    For a full list of variables, see: :ref:`reference-form-twig-variables`.
 
 In almost every Twig function above, the final argument is an array of "variables"
 that are used when rendering that one part of the form. For example, the
@@ -181,5 +200,67 @@ to see what options you have available.
         {# does **not** work - the variables are not recursive #}
         {{ form_widget(form, { 'attr': {'class': 'foo'} }) }}
 
+.. _reference-form-twig-variables:
+
+Form Variables Reference
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+The following variables are common to every field type. Certain field types
+may have even more variables and some variables here only really apply to
+certain types.
+
+Assuming you have a ``form`` variable in your template, and you want to reference
+the variables on the ``name`` field, accessing the variables is done by using
+a public ``vars`` property on the :class:`Symfony\\Component\\Form\\FormView`
+object:
+
+.. configuration-block::
+
+    .. code-block:: html+jinja
+
+        <label for="{{ form.name.vars.id }}"
+            class="{{ form.name.vars.required ? 'required' : '' }}">
+            {{ form.name.label }}
+        </label>
+
+    .. code-block:: html+php
+
+        <label for="<?php echo $view['form']->get('name')->vars['id'] ?>"
+            class="<?php echo $view['form']->get('name')->vars['required'] ? 'required' : '' ?>">
+            <?php echo $view['form']->get('name')->vars['label'] ?>
+        </label>
+
++-----------------+-----------------------------------------------------------------------------------------+
+| Variable        | Usage                                                                                   |
++=================+=========================================================================================+
+| ``id``          | The ``id`` HTML attribute to be rendered                                                |
++-----------------+-----------------------------------------------------------------------------------------+
+| ``name``        | The name of the field (e.g. ``title``) - but not the ``name``                           |
+|                 | HTML attribute, which is ``full_name``                                                  |
++-----------------+-----------------------------------------------------------------------------------------+
+| ``full_name``   | The ``name`` HTML attribute to be rendered                                              |
++-----------------+-----------------------------------------------------------------------------------------+
+| ``errors``      | An array of any errors attached to *this* specific field (e.g. ``form.title.errors``).  |
+|                 | Note that you can't use ``form.errors`` to determine if a form is valid,                |
+|                 | since this only returns "global" errors: some individual fields may have errors         |
++-----------------+-----------------------------------------------------------------------------------------+
+| ``value``       | The value that will be used when rendering (commonly the ``value`` HTML attribute)      |
++-----------------+-----------------------------------------------------------------------------------------+
+| ``read_only``   | If ``true``, ``disabled="disabled"`` is added to the field                              |
++-----------------+-----------------------------------------------------------------------------------------+
+| ``required``    | If ``true``, a ``required`` attribute is added to the field to activate HTML5           |
+|                 | validation. Additionally, a ``required`` class is added to the label.                   |
++-----------------+-----------------------------------------------------------------------------------------+
+| ``max_length``  | Adds a ``maxlength`` HTML attribute to the element                                      |
++-----------------+-----------------------------------------------------------------------------------------+
+| ``pattern``     | Adds a ``pattern`` HTML attribute to the element                                        |
++-----------------+-----------------------------------------------------------------------------------------+
+| ``label``       | The string label that will be rendered                                                  |
++-----------------+-----------------------------------------------------------------------------------------+
+| ``multipart``   | If ``true``, ``form_enctype`` will render ``enctype="multipart/form-data"``.            |
+|                 | This only applies to the root form element.                                             |
++-----------------+-----------------------------------------------------------------------------------------+
+| ``attr``        | A key-value array that will be rendered as HTML attributes on the field                 |
++-----------------+-----------------------------------------------------------------------------------------+
 
 .. _`form_div_layout.html.twig`: https://github.com/symfony/symfony/blob/2.1/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig

reference/map.rst.inc

@@ -18,7 +18,7 @@
 
   * :doc:`Form Field Type Reference</reference/forms/types>`
   * :doc:`Validation Constraints Reference </reference/constraints>`
-  * :doc:`Twig Template Function Reference</reference/forms/twig_reference>`
+  * :doc:`Twig Template Function and Variable Reference</reference/forms/twig_reference>`
 
 * :doc:`Twig Extensions (forms, filters, tags, etc) Reference</reference/twig_reference>`