Merge branch '3.4' into 4.0

* 3.4:
  Fixed a typo
  Fixes and simplifications
  Improve routing debug page
  Improved the example to generate URLs in the console
  Minor typo
  minor symfony#8704 Client's history clear alternative (takman1)
  [Serializer] Add new default normalizers
  use the ref role instead of URLs
  Update timezone.rst
  Update timezone.rst

Author: javiereguiluz

console/request_context.rst

@@ -85,6 +85,7 @@ router service and override its settings::
             $context->setScheme('https');
             $context->setBaseUrl('my/path');
 
-            // ... your code here
+            $url = $this->router->generate('route-name', array('param-name' => 'param-value'));
+            // ...
         }
     }

form/disabling_validation.rst

@@ -21,7 +21,6 @@ for example whether an uploaded file was too large or whether non-existing
 fields were submitted.
 
 The submission of extra form fields can be controlled with the
-`allow_extra_fields config option`_ and the maximum upload file size should be
-handled via your PHP and web server configuration.
-
-.. _`allow_extra_fields config option`: https://symfony.com/doc/current/reference/forms/types/form.html#allow-extra-fields
+:ref:`allow_extra_fields config option <form-option-allow-extra-fields>` and
+the maximum upload file size should be handled via your PHP and web server
+configuration.

reference/forms/types/form.rst

@@ -50,6 +50,8 @@ Field Options
 
 .. include:: /reference/forms/types/options/action.rst.inc
 
+.. _form-option-allow-extra-fields:
+
 allow_extra_fields
 ~~~~~~~~~~~~~~~~~~
 

reference/forms/types/timezone.rst

@@ -17,6 +17,9 @@ manually, but then you should just use the ``ChoiceType`` directly.
 +-------------+------------------------------------------------------------------------+
 | Rendered as | can be various tags (see :ref:`forms-reference-choice-tags`)           |
 +-------------+------------------------------------------------------------------------+
+| Options     | - `input`_                                                             |
+|             | - `regions`_                                                           |
++-------------+------------------------------------------------------------------------+
 | Overridden  | - `choices`_                                                           |
 | options     |                                                                        |
 +-------------+------------------------------------------------------------------------+
@@ -45,6 +48,27 @@ manually, but then you should just use the ``ChoiceType`` directly.
 | Class       | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\TimezoneType` |
 +-------------+------------------------------------------------------------------------+
 
+Field Options
+-------------
+
+input
+~~~~~
+
+**type**: ``string`` **default**: ``string``
+
+The format of the *input* data - i.e. the format that the timezone is stored
+on your underlying object. Valid values are:
+
+* ``string`` (e.g. ``America/New_York``)
+* ``datetimezone`` (a ``DateTimeZone`` object)
+
+regions
+~~~~~~~
+
+**type**: ``int`` **default**: ``\DateTimeZone::ALL``
+
+The available regions in the timezone choice list. For example: ``DateTimeZone::AMERICA | DateTimeZone::EUROPE``
+
 Overridden Options
 ------------------
 

routing/debug.rst

@@ -18,12 +18,16 @@ your application:
 
 .. code-block:: text
 
-    homepage              ANY       /
-    contact               GET       /contact
-    contact_process       POST      /contact
-    article_show          ANY       /articles/{_locale}/{year}/{title}.{_format}
-    blog                  ANY       /blog/{page}
-    blog_show             ANY       /blog/{slug}
+    ------------------ -------- -------- ------ ----------------------------------------------
+     Name               Method   Scheme   Host   Path
+    ------------------ -------- -------- ------ ----------------------------------------------
+     homepage           ANY      ANY      ANY    /
+     contact            GET      ANY      ANY    /contact
+     contact_process    POST     ANY      ANY    /contact
+     article_show       ANY      ANY      ANY    /articles/{_locale}/{year}/{title}.{_format}
+     blog               ANY      ANY      ANY    /blog/{page}
+     blog_show          ANY      ANY      ANY    /blog/{slug}
+    ------------------ -------- -------- ------ ----------------------------------------------
 
 You can also get very specific information on a single route by including
 the route name after the command:

serializer.rst

@@ -44,21 +44,37 @@ you need it or it can be used in a controller::
 Adding Normalizers and Encoders
 -------------------------------
 
-Once enabled, the serializer service will be available in the container
-and will be loaded with four :ref:`encoders <component-serializer-encoders>`
-(:class:`Symfony\\Component\\Serializer\\Encoder\\JsonEncoder`,
-:class:`Symfony\\Component\\Serializer\\Encoder\\XmlEncoder`,
-:class:`Symfony\\Component\\Serializer\\Encoder\\YamlEncoder`, and
-:class:`Symfony\\Component\\Serializer\\Encoder\\CsvEncoder`) and the
-:ref:`ObjectNormalizer normalizer <component-serializer-normalizers>`.
-
-You can load normalizers and/or encoders by tagging them as
+Once enabled, the ``serializer`` service will be available in the container.
+It comes with a set of useful :ref:`encoders <component-serializer-encoders>`
+and :ref:`normalizers <component-serializer-normalizers>`.
+
+Encoders supporting the following formats are enabled:
+
+* JSON: :class:`Symfony\\Component\\Serializer\\Encoder\\JsonEncoder`
+* XML: :class:`Symfony\\Component\\Serializer\\Encoder\\XmlEncoder`
+
+As well as the following normalizers:
+
+* :class:`Symfony\\Component\\Serializer\\Normalizer\\ObjectNormalizer` to
+  handle typical data objects
+* :class:`Symfony\\Component\\Serializer\\Normalizer\\DateTimeNormalizer` for
+  objects implementing the :class:`DateTimeInterface` interface
+* :class:`Symfony\\Component\\Serializer\\Normalizer\\DataUriNormalizer` to
+  transform :class:`SplFileInfo` objects in `Data URIs`_
+* :class:`Symfony\\Component\\Serializer\\Normalizer\\JsonSerializableNormalizer`
+  to deal with objects implementing the :class:`JsonSerializable` interface
+* :class:`Symfony\\Component\\Serializer\\Normalizer\\ArrayDenormalizer` to
+  denormalize arrays of objects using a format like `MyObject[]` (note the `[]` suffix)
+
+Custom normalizers and/or encoders can also be loaded by tagging them as
 :ref:`serializer.normalizer <reference-dic-tags-serializer-normalizer>` and
 :ref:`serializer.encoder <reference-dic-tags-serializer-encoder>`. It's also
 possible to set the priority of the tag in order to decide the matching order.
 
 Here is an example on how to load the
-:class:`Symfony\\Component\\Serializer\\Normalizer\\GetSetMethodNormalizer`:
+:class:`Symfony\\Component\\Serializer\\Normalizer\\GetSetMethodNormalizer`, a
+faster alternative to the `ObjectNormalizer` when data objects always use
+getters and setters:
 
 .. configuration-block::
 
@@ -193,3 +209,4 @@ take a look at how this bundle works.
 .. _`ApiPlatform`: https://github.com/api-platform/core
 .. _`JSON-LD`: http://json-ld.org
 .. _`Hydra Core Vocabulary`: http://hydra-cg.com
+.. _`Data URIs`: https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs