Dec 2, 2015 · Feb 10, 2016 · Feb 10, 2016 · Feb 12, 2016 · Feb 6, 2016 · Feb 15, 2016
diff --git a/book/routing.rst b/book/routing.rst
 ~~~~~~~~~~~~~~~~~~~~~~~~

 By default, the router will generate relative URLs (e.g. ``/blog``). From
 a controller, simply pass ``true`` to the third argument of the ``generateUrl()``
 a controller, simply pass ``UrlGeneratorInterface::ABSOLUTE_URL`` to the third argument of the ``generateUrl()``
 method::

    use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
diff --git a/components/dependency_injection/factories.rst b/components/dependency_injection/factories.rst
                    factory-class="NewsletterManagerFactory"
                    factory-method="createNewsletterManager" />
            </services>
        </services>
        </container>

    .. code-block:: php

diff --git a/components/event_dispatcher/introduction.rst b/components/event_dispatcher/introduction.rst
diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst
 :method:`Symfony\\Component\\HttpFoundation\\ParameterBag::filter`
    Filters the parameter by using the PHP :phpfunction:`filter_var` function.

 All getterstakes up to three arguments: the first one is the parameter name
 All getterstake up to three arguments: the first one is the parameter name
 and the second one is the default value to return if the parameter does not
 exist::

diff --git a/cookbook/bundles/installation.rst b/cookbook/bundles/installation.rst
 .. code-block:: text

    assetic:
        debug:                %kernel.debug%
        debug:'%kernel.debug%'
        use_controller:
            enabled:              %kernel.debug%
            enabled:'%kernel.debug%'
            profiler:             false
        read_from:            %kernel.root_dir%/../web
        write_to:             %assetic.read_from%
        read_from:'%kernel.root_dir%/../web'
        write_to:'%assetic.read_from%'
        java:                 /usr/bin/java
        node:                 /usr/local/bin/node
        node_paths:           []
diff --git a/cookbook/doctrine/registration_form.rst b/cookbook/doctrine/registration_form.rst
 ``plainPassword``
    This field is *not* persisted: (notice no ``@ORM\Column`` above it). It
    temporarily stores the plain password from the registration form. This field
    can be validated then used to populate the ``password`` field.
    can be validatedand isthen used to populate the ``password`` field.

 With some validation added, your class may look something like this::


        public function getSalt()
        {
            // The bcrypt algorithmdon't require a separate salt.
            // The bcrypt algorithmdoesn't require a separate salt.
            // You *may* need a real salt if you choose a different encoder.
            return null;
        }

        // other methods, including security methods like getRoles()
    }

 The ``UserInterface`` requires a few other methods and your ``security.yml`` file
 needs to be configured properly to work with the ``User`` entity. For a more full
 example, see the :ref:`Entity Provider <security-crete-user-entity>` article.
 The :class:`Symfony\\Component\\Security\\Core\\User\\UserInterface` requires
 a few other methods and your ``security.yml`` file needs to be configured
 properly to work with the ``User`` entity. For a more complete example, see
 the :ref:`Entity Provider <security-crete-user-entity>` article.

 .. _cookbook-registration-password-max:

        public function setDefaultOptions(OptionsResolverInterface $resolver)
        {
            $resolver->setDefaults(array(
                'data_class' => 'AppBundle\Entity\User'
                'data_class' => 'AppBundle\Entity\User',
            ));
        }


 .. tip::

    To explore more things about the Form component, read :doc:`/book/forms`.
    To explore more things about the Form component, read the
    :doc:`chapter about forms </book/forms>` in the book.

 Handling the Form Submission
 ----------------------------
    // src/AppBundle/Controller/RegistrationController.php
    namespace AppBundle\Controller;

    use Symfony\Bundle\FrameworkBundle\Controller\Controller;

    use AppBundle\Form\UserType;
    use AppBundle\Entity\User;
    use Symfony\Component\HttpFoundation\Request;
    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
    use Symfony\Bundle\FrameworkBundle\Controller\Controller;
    use Symfony\Component\HttpFoundation\Request;

    class RegistrationController extends Controller
    {
                $em->persist($user);
                $em->flush();

                // ... do any other work - likesend them an email, etc
                // ... do any other work - likesending them an email, etc
                // maybe set a "flash" success message for the user

                $redirectUrl = $this->generateUrl('replace_with_some_route');
 Update your Database Schema
 ---------------------------

 If you've updated the User entity during this tutorial, you have to update your
 database schema using this command:
 If you've updated the``User`` entity during this tutorial, you have to update
 yourdatabase schema using this command:

 .. code-block:: bash

        // ...
    }

 Next, just update the ``providers`` section of your ``security.yml``so that Symfony
 knows to load your users via the ``email`` property on login. See
 :ref:`authenticating-someone-with-a-custom-entity-provider`.
 Next, just update the ``providers`` section of your ``security.yml``file
 so that Symfonyknowshowto load your users via the ``email`` property on
 login. See:ref:`authenticating-someone-with-a-custom-entity-provider`.

 Adding a "accept terms" Checkbox
 --------------------------------
diff --git a/cookbook/doctrine/reverse_engineering.rst b/cookbook/doctrine/reverse_engineering.rst
 if you want to use YAML or XML mapping instead of annotations, you should
 execute the second command only.

 ..tip::
 ..caution::

    If you want to use annotations, you can safely delete the XML (or YAML) files
    after running these two commands.
    If you want to use annotations, you must remove the XML (or YAML) files
    after running these two commands. This is necessary as
    :ref:`it is not possible to mix mapping configuration formats <book-doctrine-adding-mapping>`

 For example, the newly created ``BlogComment`` entity class looks as follow::

diff --git a/cookbook/map.rst.inc b/cookbook/map.rst.inc
  * :doc:`/cookbook/routing/custom_route_loader`
  * :doc:`/cookbook/routing/redirect_trailing_slash`
  * :doc:`/cookbook/routing/extra_information`
  * :doc:`/cookbook/routing/routing_from_database`

 * :doc:`Security Authentication (Identifying/Logging in the User) </cookbook/security/index>`

diff --git a/cookbook/routing/index.rst b/cookbook/routing/index.rst
    custom_route_loader
    redirect_trailing_slash
    extra_information
    routing_from_database
diff --git a/cookbook/routing/routing_from_database.rst b/cookbook/routing/routing_from_database.rst
 .. index::
   single: Routing; Extra Information

 Looking up Routes from a Database: Symfony CMF DynamicRouter
 ============================================================

 The core Symfony Routing System is excellent at handling complex sets
 of routes. A highly optimized routing cache is dumped during
 deployments.

 However, when working with large amounts of data that each need a nice
 readable URL (e.g. for search engine optimization purposes), the routing
 can get slowed down. Additionally, if routes need to be edited by users,
 the route cache would need to be rebuilt frequently.

 For these cases, the ``DynamicRouter`` offers an alternative approach:

 * Routes are stored in a database;
 * There is a database index on the path field, the lookup scales to huge
  numbers of different routes;
 * Writes only affect the index of the database, which is very efficient.

 When all routes are known during deploy time and the number is not too
 high, using a :doc:`custom route loader <custom_route_loader>` is the
 preferred way to add more routes. When working with just one type of
 objects, a slug parameter on the object and the ``@ParamConverter``
 annotation work fine (see FrameworkExtraBundle_) .

 The ``DynamicRouter`` is useful when you need ``Route`` objects with
 the full feature set of Symfony. Each route can define a specific
 controller so you can decouple the URL structure from your application
 logic.

 The DynamicRouter comes with built-in support for Doctrine ORM and Doctrine
 PHPCR-ODM but offers the ``ContentRepositoryInterface`` to write a custom
 loader, e.g. for another database type or a REST API or anything else.

 The DynamicRouter is explained in the `Symfony CMF documentation`_.

 .. _FrameworkExtraBundle: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
 .. _`Symfony CMF documentation`: http://symfony.com/doc/master/cmf/book/routing.html
diff --git a/cookbook/session/locale_sticky_session.rst b/cookbook/session/locale_sticky_session.rst
        public static function getSubscribedEvents()
        {
            return array(
                // must be registeredbefore the default Locale listener
                KernelEvents::REQUEST => array(array('onKernelRequest',17)),
                // must be registeredafter the default Locale listener
                KernelEvents::REQUEST => array(array('onKernelRequest',15)),
            );
        }
    }
diff --git a/cookbook/validation/custom_constraint.rst b/cookbook/validation/custom_constraint.rst
 If your constraint validator has dependencies, such as a database connection,
 it will need to be configured as a service in the Dependency Injection
 Container. This service must include the ``validator.constraint_validator``
 tag and an ``alias`` attribute:
 tag andmay includean ``alias`` attribute:

 .. configuration-block::

            ->register('validator.unique.your_validator_name', 'Fully\Qualified\Validator\Class\Name')
            ->addTag('validator.constraint_validator', array('alias' => 'alias_name'));

 Your constraint class should now use this alias to reference the appropriate
 validator::
 As mentioned above, Symfony will automatically look for a class named after
 the constraint, with ``Validator`` appended. You can override this in you constraint class::

    public function validatedBy()
    {
        return 'alias_name';
        return 'Fully\Qualified\Class\Named\ConstraintValidator'; \\ or 'alias_name' if provided
    }

 As mentioned above, Symfony will automatically look for a class named after
 the constraint, with ``Validator`` appended. If your constraint validator
 is defined as a service, it's important that you override the
 ``validatedBy()`` method to return the alias used when defining your service,
 otherwise Symfony won't use the constraint validator service, and will
 instantiate the class instead, without any dependencies injected.

 Class Constraint Validator
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1477,7 +1477,7 @@ Generating Absolute URLs
		~~~~~~~~~~~~~~~~~~~~~~~~

		By default, the router will generate relative URLs (e.g. ``/blog``). From
		a controller, simply pass ``true`` to the third argument of the ``generateUrl()``
		a controller, simply pass ``UrlGeneratorInterface::ABSOLUTE_URL`` to the third argument of the ``generateUrl()``
		method::

		use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -55,7 +55,7 @@ factory class:
		factory-class="NewsletterManagerFactory"
		factory-method="createNewsletterManager" />
		</services>
		</services>
		</container>

		.. code-block:: php

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -134,7 +134,7 @@ has some methods to filter the input values:
		:method:`Symfony\\Component\\HttpFoundation\\ParameterBag::filter`
		Filters the parameter by using the PHP :phpfunction:`filter_var` function.

		All getterstakes up to three arguments: the first one is the parameter name
		All getterstake up to three arguments: the first one is the parameter name
		and the second one is the default value to return if the parameter does not
		exist::

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -122,12 +122,12 @@ The output will look like this:
		.. code-block:: text

		assetic:
		debug: %kernel.debug%
		debug:'%kernel.debug%'
		use_controller:
		enabled: %kernel.debug%
		enabled:'%kernel.debug%'
		profiler: false
		read_from: %kernel.root_dir%/../web
		write_to: %assetic.read_from%
		read_from:'%kernel.root_dir%/../web'
		write_to:'%assetic.read_from%'
		java: /usr/bin/java
		node: /usr/local/bin/node
		node_paths: []
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,7 +35,7 @@ Your ``User`` entity will probably at least have the following fields:
		``plainPassword``
		This field is not persisted: (notice no ``@ORM\Column`` above it). It
		temporarily stores the plain password from the registration form. This field
		can be validated then used to populate the ``password`` field.
		can be validatedand isthen used to populate the ``password`` field.

		With some validation added, your class may look something like this::

Expand DownExpand Up		@@ -127,17 +127,18 @@ With some validation added, your class may look something like this::

		public function getSalt()
		{
		// The bcrypt algorithmdon't require a separate salt.
		// The bcrypt algorithmdoesn't require a separate salt.
		// You may need a real salt if you choose a different encoder.
		return null;
		}

		// other methods, including security methods like getRoles()
		}

		The ``UserInterface`` requires a few other methods and your ``security.yml`` file
		needs to be configured properly to work with the ``User`` entity. For a more full
		example, see the :ref:`Entity Provider <security-crete-user-entity>` article.
		The :class:`Symfony\\Component\\Security\\Core\\User\\UserInterface` requires
		a few other methods and your ``security.yml`` file needs to be configured
		properly to work with the ``User`` entity. For a more complete example, see
		the :ref:`Entity Provider <security-crete-user-entity>` article.

		.. _cookbook-registration-password-max:

Expand DownExpand Up		@@ -186,7 +187,7 @@ Next, create the form for the ``User`` entity::
		public function setDefaultOptions(OptionsResolverInterface $resolver)
		{
		$resolver->setDefaults(array(
		'data_class' => 'AppBundle\Entity\User'
		'data_class' => 'AppBundle\Entity\User',
		));
		}

Expand All		@@ -201,7 +202,8 @@ There are just three fields: ``email``, ``username`` and ``plainPassword``

		.. tip::

		To explore more things about the Form component, read :doc:`/book/forms`.
		To explore more things about the Form component, read the
		:doc:`chapter about forms </book/forms>` in the book.

		Handling the Form Submission
		----------------------------
Expand All		@@ -213,12 +215,11 @@ into the database::
		// src/AppBundle/Controller/RegistrationController.php
		namespace AppBundle\Controller;

		use Symfony\Bundle\FrameworkBundle\Controller\Controller;

		use AppBundle\Form\UserType;
		use AppBundle\Entity\User;
		use Symfony\Component\HttpFoundation\Request;
		use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
		use Symfony\Bundle\FrameworkBundle\Controller\Controller;
		use Symfony\Component\HttpFoundation\Request;

		class RegistrationController extends Controller
		{
Expand DownExpand Up		@@ -246,7 +247,7 @@ into the database::
		$em->persist($user);
		$em->flush();

		// ... do any other work - likesend them an email, etc
		// ... do any other work - likesending them an email, etc
		// maybe set a "flash" success message for the user

		$redirectUrl = $this->generateUrl('replace_with_some_route');
Expand DownExpand Up		@@ -376,8 +377,8 @@ See :doc:`/cookbook/form/form_customization` for more details.
		Update your Database Schema
		---------------------------

		If you've updated the User entity during this tutorial, you have to update your
		database schema using this command:
		If you've updated the``User`` entity during this tutorial, you have to update
		yourdatabase schema using this command:

		.. code-block:: bash

Expand DownExpand Up		@@ -409,9 +410,9 @@ return the ``email`` property::
		// ...
		}

		Next, just update the ``providers`` section of your ``security.yml``so that Symfony
		knows to load your users via the ``email`` property on login. See
		:ref:`authenticating-someone-with-a-custom-entity-provider`.
		Next, just update the ``providers`` section of your ``security.yml``file
		so that Symfonyknowshowto load your users via the ``email`` property on
		login. See:ref:`authenticating-someone-with-a-custom-entity-provider`.

		Adding a "accept terms" Checkbox
		--------------------------------
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -99,10 +99,11 @@ The first command generates entity classes with annotation mappings. But
		if you want to use YAML or XML mapping instead of annotations, you should
		execute the second command only.

		..tip::
		..caution::

		If you want to use annotations, you can safely delete the XML (or YAML) files
		after running these two commands.
		If you want to use annotations, you must remove the XML (or YAML) files
		after running these two commands. This is necessary as
		:ref:`it is not possible to mix mapping configuration formats <book-doctrine-adding-mapping>`

		For example, the newly created ``BlogComment`` entity class looks as follow::

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -150,6 +150,7 @@
		* :doc:`/cookbook/routing/custom_route_loader`
		* :doc:`/cookbook/routing/redirect_trailing_slash`
		* :doc:`/cookbook/routing/extra_information`
		* :doc:`/cookbook/routing/routing_from_database`

		* :doc:`Security Authentication (Identifying/Logging in the User) </cookbook/security/index>`

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,4 @@ Routing
		custom_route_loader
		redirect_trailing_slash
		extra_information
		routing_from_database
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,41 @@
		.. index::
		single: Routing; Extra Information

		Looking up Routes from a Database: Symfony CMF DynamicRouter
		============================================================

		The core Symfony Routing System is excellent at handling complex sets
		of routes. A highly optimized routing cache is dumped during
		deployments.

		However, when working with large amounts of data that each need a nice
		readable URL (e.g. for search engine optimization purposes), the routing
		can get slowed down. Additionally, if routes need to be edited by users,
		the route cache would need to be rebuilt frequently.

		For these cases, the ``DynamicRouter`` offers an alternative approach:

		* Routes are stored in a database;
		* There is a database index on the path field, the lookup scales to huge
		numbers of different routes;
		* Writes only affect the index of the database, which is very efficient.

		When all routes are known during deploy time and the number is not too
		high, using a :doc:`custom route loader <custom_route_loader>` is the
		preferred way to add more routes. When working with just one type of
		objects, a slug parameter on the object and the ``@ParamConverter``
		annotation work fine (see FrameworkExtraBundle_) .

		The ``DynamicRouter`` is useful when you need ``Route`` objects with
		the full feature set of Symfony. Each route can define a specific
		controller so you can decouple the URL structure from your application
		logic.

		The DynamicRouter comes with built-in support for Doctrine ORM and Doctrine
		PHPCR-ODM but offers the ``ContentRepositoryInterface`` to write a custom
		loader, e.g. for another database type or a REST API or anything else.

		The DynamicRouter is explained in the `Symfony CMF documentation`_.

		.. _FrameworkExtraBundle: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
		.. _`Symfony CMF documentation`: http://symfony.com/doc/master/cmf/book/routing.html
Original file line number	Diff line number	Diff line change
Expand Up		@@ -54,8 +54,8 @@ how you determine the desired locale from the request::
		public static function getSubscribedEvents()
		{
		return array(
		// must be registeredbefore the default Locale listener
		KernelEvents::REQUEST => array(array('onKernelRequest',17)),
		// must be registeredafter the default Locale listener
		KernelEvents::REQUEST => array(array('onKernelRequest',15)),
		);
		}
		}
Expand Down