Jan 31, 2016 · Jan 31, 2016 · Jan 28, 2016 · Jan 31, 2016 · Dec 26, 2015 · Feb 1, 2016
diff --git a/book/templating.rst b/book/templating.rst
 Additionally, if you use the ``asset`` function, Symfony can automatically
 append a query string to your asset, in order to guarantee that updated static
 assets won't be cached when deployed. For example, ``/images/logo.png`` might
 look like ``/images/logo.png?v2``. For more information, see the :ref:`ref-framework-assets-version`
 look like ``/images/logo.png?v2``. For more information, see the :ref:`reference-framework-assets-version`
 configuration option.

 .. _`book-templating-version-by-asset`:
        ) ?>" alt="Symfony!" />

 If you don't give a version or pass ``null``, the default package version
 (from :ref:`ref-framework-assets-version`) will be used. If you pass ``false``,
 (from :ref:`reference-framework-assets-version`) will be used. If you pass ``false``,
 versioned URL will be deactivated for this asset.

 If you need absolute URLs for assets, you can use the ``absolute_url`` function
diff --git a/changelog.rst b/changelog.rst
 New Documentation
 ~~~~~~~~~~~~~~~~~

 * `#6172 <https://github.com/symfony/symfony-docs/pull/6172>`_ move assets options from templating to assets section and add base_path documentation (snoek09)
 * `#6021 <https://github.com/symfony/symfony-docs/pull/6021>`_ mention routing from the database (dbu)
 * `#6233 <https://github.com/symfony/symfony-docs/pull/6233>`_ Document translation_domain for choice fields (merorafael, WouterJ)
 * `#5655 <https://github.com/symfony/symfony-docs/pull/5655>`_ Added doc about Homestead's Symfony integration (WouterJ)
 * `#6072 <https://github.com/symfony/symfony-docs/pull/6072>`_ Add browserkit component documentation (yamiko, yamiko-ninja, robert Parker, javiereguiluz)
 * `#6243 <https://github.com/symfony/symfony-docs/pull/6243>`_ Add missing getBoolean() method (bocharsky-bw)
 * `#6231 <https://github.com/symfony/symfony-docs/pull/6231>`_ Use hash_equals instead of StringUtils::equals (WouterJ)
 * `#5724 <https://github.com/symfony/symfony-docs/pull/5724>`_ Describe configuration behaviour with multiple mailers (xelan)
 * `#6077 <https://github.com/symfony/symfony-docs/pull/6077>`_ fixes #5971 (vincentaubert)
 * `#6156 <https://github.com/symfony/symfony-docs/pull/6156>`_ [reference] [form] [options] fix #6153 (HeahDude)
 * `#6104 <https://github.com/symfony/symfony-docs/pull/6104>`_ Fix #6103 (zsturgess)
 * `#5856 <https://github.com/symfony/symfony-docs/pull/5856>`_ Reworded the "How to use Gmail" cookbook article (javiereguiluz)
 * `#6230 <https://github.com/symfony/symfony-docs/pull/6230>`_ Add annotation to glossary (rebased) (DerStoffel)
 * `#5642 <https://github.com/symfony/symfony-docs/pull/5642>`_ Documented label_format option (WouterJ)

 Fixed Documentation
 ~~~~~~~~~~~~~~~~~~~
 * `#6251 <https://github.com/symfony/symfony-docs/pull/6251>`_ To use annotations, files must be removed (pbowyer)
 * `#6288 <https://github.com/symfony/symfony-docs/pull/6288>`_ Update factories.rst (velikanov)
 * `#6278 <https://github.com/symfony/symfony-docs/pull/6278>`_ [HttpFoundation] Fix typo for ParameterBag getters (rendler-denis)
 * `#6280 <https://github.com/symfony/symfony-docs/pull/6280>`_ Fix syntax of Company class example (cakper)
 * `#6284 <https://github.com/symfony/symfony-docs/pull/6284>`_ [Book] [Routing] Fix third param true to UrlGeneratorInterface::ABSOLUTE_URI (eriwin)
 * `#6269 <https://github.com/symfony/symfony-docs/pull/6269>`_ [Cookbook][Bundles]fix yaml syntax (mhor)
 * `#6255 <https://github.com/symfony/symfony-docs/pull/6255>`_ [Cookbook][Doctrine] some tweaks to the Doctrine registration article (xabbuh)
 * `#6229 <https://github.com/symfony/symfony-docs/pull/6229>`_ Rewrite EventDispatcher introduction (WouterJ)
 * `#6260 <https://github.com/symfony/symfony-docs/pull/6260>`_ add missing options `choice_value`, `choice_name` and `choice_attr` to `EntityType` (HeahDude)
 * `#6262 <https://github.com/symfony/symfony-docs/pull/6262>`_ [Form] reorder options in choice types references (HeahDude)
 * `#6256 <https://github.com/symfony/symfony-docs/pull/6256>`_ Fixed code example (twifty)
 * `#6250 <https://github.com/symfony/symfony-docs/pull/6250>`_ [Cookbook][Console] remove note about memory spool handling on CLI (xabbuh)
 * `#6249 <https://github.com/symfony/symfony-docs/pull/6249>`_ [Cookbook][Serializer] fix wording (xabbuh)
 * `#6246 <https://github.com/symfony/symfony-docs/pull/6246>`_ removed duplicate lines (seferov)
 * `#6222 <https://github.com/symfony/symfony-docs/pull/6222>`_ Updated "Learn more from the Cookbook" section (sfdumi)
 * `#6245 <https://github.com/symfony/symfony-docs/pull/6245>`_ [Cookbook][Console] change API doc class name (xabbuh)
 * `#6223 <https://github.com/symfony/symfony-docs/pull/6223>`_ Improveme the apache/mod_php configuration example (gnat42)
 * `#6234 <https://github.com/symfony/symfony-docs/pull/6234>`_ File System Security Issue in Custom Auth Article (finished) (mattjanssen, WouterJ)
 * `#4773 <https://github.com/symfony/symfony-docs/pull/4773>`_ [Cookbook] Make registration_form follow best practices (xelaris)
 * `#5630 <https://github.com/symfony/symfony-docs/pull/5630>`_ Add a caution about logout when using http-basic authenticated firewall (rmed19)
 * `#6215 <https://github.com/symfony/symfony-docs/pull/6215>`_ Added a caution about failing cache warmers (javiereguiluz)
 * `#6239 <https://github.com/symfony/symfony-docs/pull/6239>`_ Remove app_dev as build-in server is used (rmed19, WouterJ)
 * `#6241 <https://github.com/symfony/symfony-docs/pull/6241>`_ [ExpressionLanguage] Add caution about backslash handling (zerustech, WouterJ)
 * `#6236 <https://github.com/symfony/symfony-docs/pull/6236>`_ fix some minor typos (xabbuh)
 * `#6237 <https://github.com/symfony/symfony-docs/pull/6237>`_ use literals for external class names (xabbuh)
 * `#6206 <https://github.com/symfony/symfony-docs/pull/6206>`_ add separate placeholder examples for birthday, datetime and time type (snoek09)
 * `#6238 <https://github.com/symfony/symfony-docs/pull/6238>`_ fix directive name (xabbuh)
 * `#6224 <https://github.com/symfony/symfony-docs/pull/6224>`_ Note to create a service if you extend ExceptionController (pamuche)
 * `#5958 <https://github.com/symfony/symfony-docs/pull/5958>`_ Update security.rst (mpaquet)
 * `#6092 <https://github.com/symfony/symfony-docs/pull/6092>`_ Updated information about testing code coverage. (roga)
 * `#6051 <https://github.com/symfony/symfony-docs/pull/6051>`_ Mention HautelookAliceBundle in best practices (theofidry, WouterJ)
 * `#6220 <https://github.com/symfony/symfony-docs/pull/6220>`_ [book] fixes typo about redirect status codes in the controller chapter. (hhamon)
 * `#6227 <https://github.com/symfony/symfony-docs/pull/6227>`_ Update testing.rst (dvapelnik)
 * `#6212 <https://github.com/symfony/symfony-docs/pull/6212>`_ Typo in default session save_path (DerekRoth)
 * `#6208 <https://github.com/symfony/symfony-docs/pull/6208>`_ Replace references of PSR-0 with PSR-4 (opdavies)
diff --git a/components/event_dispatcher/introduction.rst b/components/event_dispatcher/introduction.rst
 in listeners, event chaining or even lazy loading of more listeners into
 the dispatcher object as shown in the following examples.

 Lazy loading listeners::

    use Symfony\Component\EventDispatcher\Event;
    use Symfony\Component\EventDispatcher\EventDispatcherInterface;
    use Acme\StoreBundle\Event\StoreSubscriber;

    class Foo
    {
        private $started = false;

        public function myLazyListener(
            Event $event,
            $eventName,
            EventDispatcherInterface $dispatcher
        ) {
            if (false === $this->started) {
                $subscriber = new StoreSubscriber();
                $dispatcher->addSubscriber($subscriber);
            }

            $this->started = true;

            // ... more code
        }
    }

 Dispatching another event from within a listener::

    use Symfony\Component\EventDispatcher\Event;
    use Symfony\Component\EventDispatcher\EventDispatcherInterface;

    class Foo
    {
        public function myFooListener(
            Event $event,
            $eventName,
            EventDispatcherInterface $dispatcher
        ) {
            $dispatcher->dispatch('log', $event);

            // ... more code
        }
    }

 While this above is sufficient for most uses, if your application uses multiple
 ``EventDispatcher`` instances, you might need to specifically inject a known
 instance of the ``EventDispatcher`` into your listeners. This could be done
 using constructor or setter injection as follows:

 Constructor injection::

    use Symfony\Component\EventDispatcher\EventDispatcherInterface;

    class Foo
    {
        protected $dispatcher = null;

        public function __construct(EventDispatcherInterface $dispatcher)
        {
            $this->dispatcher = $dispatcher;
        }
    }

 Or setter injection::

    use Symfony\Component\EventDispatcher\EventDispatcherInterface;

    class Foo
    {
        protected $dispatcher = null;

        public function setEventDispatcher(EventDispatcherInterface $dispatcher)
        {
            $this->dispatcher = $dispatcher;
        }
    }

 Choosing between the two is really a matter of taste. Many tend to prefer
 the constructor injection as the objects are fully initialized at construction
 time. But when you have a long list of dependencies, using setter injection
 can be the way to go, especially for optional dependencies.
 This can lead to some advanced applications of the ``EventDispatcher``
 including dispatching other events inside listeners, chaining events or even
 lazy loading listeners into the dispatcher object.

 .. index::
   single: EventDispatcher; Dispatcher shortcuts
diff --git a/components/form/introduction.rst b/components/form/introduction.rst

        public function searchAction()
        {
            $formBuilder = $this->createFormBuilder(FormType::class,null, array(
            $formBuilder = $this->createFormBuilder(null, array(
                'action' => '/search',
                'method' => 'GET',
            ));
diff --git a/components/serializer.rst b/components/serializer.rst

    class Company
    {
        public name;
        public address;
        public$name;
        public$address;
    }

 And in the serialized form, all attributes must be prefixed by ``org_`` like
diff --git a/cookbook/assetic/asset_management.rst b/cookbook/assetic/asset_management.rst
    Symfony also contains a method for cache *busting*, where the final URL
    generated by Assetic contains a query parameter that can be incremented
    via configuration on each deployment. For more information, see the
    :ref:`ref-framework-assets-version` configuration option.
    :ref:`reference-framework-assets-version` configuration option.

 .. _cookbook-assetic-dumping:

diff --git a/reference/configuration/assetic.rst b/reference/configuration/assetic.rst
                some_filter:                 []
            workers:
                # see https://github.com/symfony/AsseticBundle/pull/119
                # Cache can also be busted via the framework.templating.assets_version
                # Cache can also be busted via the framework.assets.version
                # setting - see the "framework" configuration section
                cache_busting:
                    enabled:              false
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1071,7 +1071,7 @@ being used and generating the correct paths accordingly.
		Additionally, if you use the ``asset`` function, Symfony can automatically
		append a query string to your asset, in order to guarantee that updated static
		assets won't be cached when deployed. For example, ``/images/logo.png`` might
		look like ``/images/logo.png?v2``. For more information, see the :ref:`ref-framework-assets-version`
		look like ``/images/logo.png?v2``. For more information, see the :ref:`reference-framework-assets-version`
		configuration option.

		.. _`book-templating-version-by-asset`:
Expand All		@@ -1095,7 +1095,7 @@ if you are using Twig (or the fourth argument if you are using PHP) to the desir
		) ?>" alt="Symfony!" />

		If you don't give a version or pass ``null``, the default package version
		(from :ref:`ref-framework-assets-version`) will be used. If you pass ``false``,
		(from :ref:`reference-framework-assets-version`) will be used. If you pass ``false``,
		versioned URL will be deactivated for this asset.

		If you need absolute URLs for assets, you can use the ``absolute_url`` function
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,15 +19,20 @@ February, 2016
		New Documentation
		~~~~~~~~~~~~~~~~~

		* `#6172 <https://github.com/symfony/symfony-docs/pull/6172>`_ move assets options from templating to assets section and add base_path documentation (snoek09)
		* `#6021 <https://github.com/symfony/symfony-docs/pull/6021>`_ mention routing from the database (dbu)
		* `#6233 <https://github.com/symfony/symfony-docs/pull/6233>`_ Document translation_domain for choice fields (merorafael, WouterJ)
		* `#5655 <https://github.com/symfony/symfony-docs/pull/5655>`_ Added doc about Homestead's Symfony integration (WouterJ)
		* `#6072 <https://github.com/symfony/symfony-docs/pull/6072>`_ Add browserkit component documentation (yamiko, yamiko-ninja, robert Parker, javiereguiluz)
		* `#6243 <https://github.com/symfony/symfony-docs/pull/6243>`_ Add missing getBoolean() method (bocharsky-bw)
		* `#6231 <https://github.com/symfony/symfony-docs/pull/6231>`_ Use hash_equals instead of StringUtils::equals (WouterJ)
		* `#5724 <https://github.com/symfony/symfony-docs/pull/5724>`_ Describe configuration behaviour with multiple mailers (xelan)
		* `#6077 <https://github.com/symfony/symfony-docs/pull/6077>`_ fixes #5971 (vincentaubert)
		* `#6156 <https://github.com/symfony/symfony-docs/pull/6156>`_ [reference] [form] [options] fix #6153 (HeahDude)
		* `#6104 <https://github.com/symfony/symfony-docs/pull/6104>`_ Fix #6103 (zsturgess)
		* `#5856 <https://github.com/symfony/symfony-docs/pull/5856>`_ Reworded the "How to use Gmail" cookbook article (javiereguiluz)
		* `#6230 <https://github.com/symfony/symfony-docs/pull/6230>`_ Add annotation to glossary (rebased) (DerStoffel)
		* `#5642 <https://github.com/symfony/symfony-docs/pull/5642>`_ Documented label_format option (WouterJ)

		Fixed Documentation
		~~~~~~~~~~~~~~~~~~~
Expand All		@@ -44,26 +49,35 @@ Minor Documentation Changes
		* `#6251 <https://github.com/symfony/symfony-docs/pull/6251>`_ To use annotations, files must be removed (pbowyer)
		* `#6288 <https://github.com/symfony/symfony-docs/pull/6288>`_ Update factories.rst (velikanov)
		* `#6278 <https://github.com/symfony/symfony-docs/pull/6278>`_ [HttpFoundation] Fix typo for ParameterBag getters (rendler-denis)
		* `#6280 <https://github.com/symfony/symfony-docs/pull/6280>`_ Fix syntax of Company class example (cakper)
		* `#6284 <https://github.com/symfony/symfony-docs/pull/6284>`_ [Book] [Routing] Fix third param true to UrlGeneratorInterface::ABSOLUTE_URI (eriwin)
		* `#6269 <https://github.com/symfony/symfony-docs/pull/6269>`_ [Cookbook][Bundles]fix yaml syntax (mhor)
		* `#6255 <https://github.com/symfony/symfony-docs/pull/6255>`_ [Cookbook][Doctrine] some tweaks to the Doctrine registration article (xabbuh)
		* `#6229 <https://github.com/symfony/symfony-docs/pull/6229>`_ Rewrite EventDispatcher introduction (WouterJ)
		* `#6260 <https://github.com/symfony/symfony-docs/pull/6260>`_ add missing options `choice_value`, `choice_name` and `choice_attr` to `EntityType` (HeahDude)
		* `#6262 <https://github.com/symfony/symfony-docs/pull/6262>`_ [Form] reorder options in choice types references (HeahDude)
		* `#6256 <https://github.com/symfony/symfony-docs/pull/6256>`_ Fixed code example (twifty)
		* `#6250 <https://github.com/symfony/symfony-docs/pull/6250>`_ [Cookbook][Console] remove note about memory spool handling on CLI (xabbuh)
		* `#6249 <https://github.com/symfony/symfony-docs/pull/6249>`_ [Cookbook][Serializer] fix wording (xabbuh)
		* `#6246 <https://github.com/symfony/symfony-docs/pull/6246>`_ removed duplicate lines (seferov)
		* `#6222 <https://github.com/symfony/symfony-docs/pull/6222>`_ Updated "Learn more from the Cookbook" section (sfdumi)
		* `#6245 <https://github.com/symfony/symfony-docs/pull/6245>`_ [Cookbook][Console] change API doc class name (xabbuh)
		* `#6223 <https://github.com/symfony/symfony-docs/pull/6223>`_ Improveme the apache/mod_php configuration example (gnat42)
		* `#6234 <https://github.com/symfony/symfony-docs/pull/6234>`_ File System Security Issue in Custom Auth Article (finished) (mattjanssen, WouterJ)
		* `#4773 <https://github.com/symfony/symfony-docs/pull/4773>`_ [Cookbook] Make registration_form follow best practices (xelaris)
		* `#5630 <https://github.com/symfony/symfony-docs/pull/5630>`_ Add a caution about logout when using http-basic authenticated firewall (rmed19)
		* `#6215 <https://github.com/symfony/symfony-docs/pull/6215>`_ Added a caution about failing cache warmers (javiereguiluz)
		* `#6239 <https://github.com/symfony/symfony-docs/pull/6239>`_ Remove app_dev as build-in server is used (rmed19, WouterJ)
		* `#6241 <https://github.com/symfony/symfony-docs/pull/6241>`_ [ExpressionLanguage] Add caution about backslash handling (zerustech, WouterJ)
		* `#6236 <https://github.com/symfony/symfony-docs/pull/6236>`_ fix some minor typos (xabbuh)
		* `#6237 <https://github.com/symfony/symfony-docs/pull/6237>`_ use literals for external class names (xabbuh)
		* `#6206 <https://github.com/symfony/symfony-docs/pull/6206>`_ add separate placeholder examples for birthday, datetime and time type (snoek09)
		* `#6238 <https://github.com/symfony/symfony-docs/pull/6238>`_ fix directive name (xabbuh)
		* `#6224 <https://github.com/symfony/symfony-docs/pull/6224>`_ Note to create a service if you extend ExceptionController (pamuche)
		* `#5958 <https://github.com/symfony/symfony-docs/pull/5958>`_ Update security.rst (mpaquet)
		* `#6092 <https://github.com/symfony/symfony-docs/pull/6092>`_ Updated information about testing code coverage. (roga)
		* `#6051 <https://github.com/symfony/symfony-docs/pull/6051>`_ Mention HautelookAliceBundle in best practices (theofidry, WouterJ)
		* `#6220 <https://github.com/symfony/symfony-docs/pull/6220>`_ [book] fixes typo about redirect status codes in the controller chapter. (hhamon)
		* `#6227 <https://github.com/symfony/symfony-docs/pull/6227>`_ Update testing.rst (dvapelnik)
		* `#6212 <https://github.com/symfony/symfony-docs/pull/6212>`_ Typo in default session save_path (DerekRoth)
		* `#6208 <https://github.com/symfony/symfony-docs/pull/6208>`_ Replace references of PSR-0 with PSR-4 (opdavies)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -445,87 +445,9 @@ advanced usages of the ``EventDispatcher`` like dispatching other events
		in listeners, event chaining or even lazy loading of more listeners into
		the dispatcher object as shown in the following examples.

		Lazy loading listeners::

		use Symfony\Component\EventDispatcher\Event;
		use Symfony\Component\EventDispatcher\EventDispatcherInterface;
		use Acme\StoreBundle\Event\StoreSubscriber;

		class Foo
		{
		private $started = false;

		public function myLazyListener(
		Event $event,
		$eventName,
		EventDispatcherInterface $dispatcher
		) {
		if (false === $this->started) {
		$subscriber = new StoreSubscriber();
		$dispatcher->addSubscriber($subscriber);
		}

		$this->started = true;

		// ... more code
		}
		}

		Dispatching another event from within a listener::

		use Symfony\Component\EventDispatcher\Event;
		use Symfony\Component\EventDispatcher\EventDispatcherInterface;

		class Foo
		{
		public function myFooListener(
		Event $event,
		$eventName,
		EventDispatcherInterface $dispatcher
		) {
		$dispatcher->dispatch('log', $event);

		// ... more code
		}
		}

		While this above is sufficient for most uses, if your application uses multiple
		``EventDispatcher`` instances, you might need to specifically inject a known
		instance of the ``EventDispatcher`` into your listeners. This could be done
		using constructor or setter injection as follows:

		Constructor injection::

		use Symfony\Component\EventDispatcher\EventDispatcherInterface;

		class Foo
		{
		protected $dispatcher = null;

		public function __construct(EventDispatcherInterface $dispatcher)
		{
		$this->dispatcher = $dispatcher;
		}
		}

		Or setter injection::

		use Symfony\Component\EventDispatcher\EventDispatcherInterface;

		class Foo
		{
		protected $dispatcher = null;

		public function setEventDispatcher(EventDispatcherInterface $dispatcher)
		{
		$this->dispatcher = $dispatcher;
		}
		}

		Choosing between the two is really a matter of taste. Many tend to prefer
		the constructor injection as the objects are fully initialized at construction
		time. But when you have a long list of dependencies, using setter injection
		can be the way to go, especially for optional dependencies.
		This can lead to some advanced applications of the ``EventDispatcher``
		including dispatching other events inside listeners, chaining events or even
		lazy loading listeners into the dispatcher object.

		.. index::
		single: EventDispatcher; Dispatcher shortcuts
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -556,7 +556,7 @@ by ``handleRequest()`` to determine whether a form has been submitted):

		public function searchAction()
		{
		$formBuilder = $this->createFormBuilder(FormType::class,null, array(
		$formBuilder = $this->createFormBuilder(null, array(
		'action' => '/search',
		'method' => 'GET',
		));
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -363,8 +363,8 @@ Given you have the following object::

		class Company
		{
		public name;
		public address;
		public$name;
		public$address;
		}

		And in the serialized form, all attributes must be prefixed by ``org_`` like
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -555,7 +555,7 @@ done from the template and is relative to the public document root:
		Symfony also contains a method for cache busting, where the final URL
		generated by Assetic contains a query parameter that can be incremented
		via configuration on each deployment. For more information, see the
		:ref:`ref-framework-assets-version` configuration option.
		:ref:`reference-framework-assets-version` configuration option.

		.. _cookbook-assetic-dumping:

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,7 +52,7 @@ Full Default Configuration
		some_filter: []
		workers:
		# see https://github.com/symfony/AsseticBundle/pull/119
		# Cache can also be busted via the framework.templating.assets_version
		# Cache can also be busted via the framework.assets.version
		# setting - see the "framework" configuration section
		cache_busting:
		enabled: false
Expand Down