Merge branch '2.0' into 2.1

Conflicts:
	cookbook/security/entity_provider.rst
	reference/forms/twig_reference.rst

Author: weaverryan

book/security.rst

@@ -1596,6 +1596,8 @@ is defined by the ``target`` parameter above (e.g. the ``homepage``). For
 more information on configuring the logout, see the
 :doc:`Security Configuration Reference</reference/configuration/security>`.
 
+.. _book-security-template:
+
 Access Control in Templates
 ---------------------------
 

book/templating.rst

@@ -701,6 +701,8 @@ in your application configuration:
 .. index::
    single: Templating; Linking to pages
 
+.. _book-templating-pages:
+
 Linking to Pages
 ~~~~~~~~~~~~~~~~
 
@@ -818,6 +820,8 @@ correctly:
 .. index::
    single: Templating; Linking to assets
 
+.. _book-templating-assets:
+
 Linking to Assets
 ~~~~~~~~~~~~~~~~~
 

book/translation.rst

@@ -720,6 +720,8 @@ Translations in Templates
 Most of the time, translation occurs in templates. Symfony2 provides native
 support for both Twig and PHP templates.
 
+.. _book-translation-twig:
+
 Twig Templates
 ~~~~~~~~~~~~~~
 

cookbook/security/entity_provider.rst

@@ -54,7 +54,7 @@ focus on the most important methods that come from the
      * @ORM\Table(name="acme_users")
      * @ORM\Entity(repositoryClass="Acme\UserBundle\Entity\UserRepository")
      */
-    class User implements UserInterface
+    class User implements UserInterface, \Serializable
     {
         /**
          * @ORM\Column(type="integer")
@@ -132,6 +132,26 @@ focus on the most important methods that come from the
         public function eraseCredentials()
         {
         }
+
+        /**
+         * @see \Serializable::serialize()
+         */
+        public function serialize()
+        {
+            return serialize(array(
+                $this->id,
+            ));
+        }
+
+        /**
+         * @see \Serializable::unserialize()
+         */
+        public function unserialize($serialized)
+        {
+            list (
+                $this->id,
+            ) = unserialize($serialized);
+        }
     }
 
 In order to use an instance of the ``AcmeUserBundle:User`` class in the Symfony
@@ -168,6 +188,15 @@ For more details on each of these, see :class:`Symfony\\Component\\Security\\Cor
         return $this->username === $user->getUsername();
     }
 
+.. note::
+
+    The :phpclass:`Serializable` interface and its ``serialize`` and ``unserialize``
+    methods have been added to allow the ``User`` class to be serialized
+    to the session. This may or may not be needed depending on your setup,
+    but it's probably a good idea. Only the ``id`` needs to be serialized,
+    because the :method:`Symfony\\Bridge\\Doctrine\\Security\\User\\EntityUserProvider::refreshUser`
+    method reloads the user on each request by using the ``id``.
+
 Below is an export of my ``User`` table from MySQL. For details on how to
 create user records and encode their password, see :ref:`book-security-encoding-user-password`.
 
@@ -368,7 +397,7 @@ The code below shows the implementation of the
                 throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', $class));
             }
 
-            return $this->loadUserByUsername($user->getUsername());
+            return $this->find($user->getId());
         }
 
         public function supportsClass($class)
@@ -429,7 +458,7 @@ returns the list of related groups::
     use Doctrine\Common\Collections\ArrayCollection;
     // ...
 
-    class User implements AdvancedUserInterface
+    class User implements AdvancedUserInterface, \Serializable
     {
         /**
          * @ORM\ManyToMany(targetEntity="Group", inversedBy="users")
@@ -448,6 +477,26 @@ returns the list of related groups::
         {
             return $this->groups->toArray();
         }
+
+        /**
+         * @see \Serializable::serialize()
+         */
+        public function serialize()
+        {
+            return serialize(array(
+                $this->id,
+            ));
+        }
+
+        /**
+         * @see \Serializable::unserialize()
+         */
+        public function unserialize($serialized)
+        {
+            list (
+                $this->id,
+            ) = unserialize($serialized);
+        }
     }
 
 The ``AcmeUserBundle:Group`` entity class defines three table fields (``id``,

reference/forms/twig_reference.rst

@@ -9,6 +9,8 @@ rendering forms. There are several different functions available, and each
 is responsible for rendering a different part of a form (e.g. labels, errors,
 widgets, etc).
 
+.. _reference-forms-twig-label:
+
 form_label(form.name, label, variables)
 ---------------------------------------
 
@@ -26,6 +28,8 @@ label you want to display as the second argument.
 See ":ref:`twig-reference-form-variables`" to learn about the ``variables``
 argument.
 
+.. _reference-forms-twig-errors:
+
 form_errors(form.name)
 ----------------------
 
@@ -38,6 +42,8 @@ Renders any errors for the given field.
     {# render any "global" errors #}
     {{ form_errors(form) }}
 
+.. _reference-forms-twig-widget:
+
 form_widget(form.name, variables)
 ---------------------------------
 
@@ -59,6 +65,8 @@ rendering many fields at once (e.g. ``form_widget(form)``).
 See ":ref:`twig-reference-form-variables`" to learn more about the ``variables``
 argument.
 
+.. _reference-forms-twig-row:
+
 form_row(form.name, variables)
 ------------------------------
 
@@ -77,6 +85,8 @@ above.
 See ":ref:`twig-reference-form-variables`" to learn about the ``variables``
 argument.
 
+.. _reference-forms-twig-rest:
+
 form_rest(form, variables)
 --------------------------
 
@@ -89,6 +99,8 @@ obvious (since it'll render the field for you).
 
     {{ form_rest(form) }}
 
+.. _reference-forms-twig-enctype:
+
 form_enctype(form)
 ------------------
 
@@ -169,4 +181,5 @@ to see what options you have available.
         {# does **not** work - the variables are not recursive #}
         {{ form_widget(form, { 'attr': {'class': 'foo'} }) }}
 
+
 .. _`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/index.rst

@@ -16,6 +16,8 @@ Reference Documents
     forms/types
     forms/twig_reference
 
+    twig_reference
+
     constraints
     dic_tags
     requirements

reference/map.rst.inc

@@ -20,6 +20,8 @@
   * :doc:`Validation Constraints Reference </reference/constraints>`
   * :doc:`Twig Template Function Reference</reference/forms/twig_reference>`
 
+* :doc:`Twig Extensions (forms, filters, tags, etc) Reference</reference/twig_reference>`
+
 * **Other Areas**
 
   * :doc:`/reference/dic_tags`