Merge remote-tracking branch 'upstream/3.3' into 3.3

Author: javiereguiluz

components/http_foundation.rst

@@ -153,7 +153,7 @@ exist::
     // returns 'baz'
 
 When PHP imports the request query, it handles request parameters like
-``foo[bar]=bar`` in a special way as it creates an array. So you can get the
+``foo[bar]=baz`` in a special way as it creates an array. So you can get the
 ``foo`` parameter and you will get back an array with a ``bar`` element::
 
     // the query string is '?foo[bar]=baz'

components/validator.rst

@@ -46,6 +46,8 @@ characters long::
         }
     }
 
+The validator returns the list of violations.
+
 Retrieving a Validator Instance
 -------------------------------
 

controller/service.rst

@@ -24,17 +24,12 @@ syntax:
 
 .. configuration-block::
 
-    .. code-block:: yaml
-
-        # app/config/routing.yml
-        hello:
-            path:     /hello
-            defaults: { _controller: app.hello_controller:indexAction }
-
     .. code-block:: php-annotations
 
-        # src/AppBundle/Controller/HelloController.php
+        // src/AppBundle/Controller/HelloController.php
         // ...
+        
+        use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 
         /**
          * @Route(service="app.hello_controller")
@@ -44,6 +39,13 @@ syntax:
             // ...
         }
 
+    .. code-block:: yaml
+
+        # app/config/routing.yml
+        hello:
+            path:     /hello
+            defaults: { _controller: app.hello_controller:indexAction }
+
     .. code-block:: xml
 
         <!-- app/config/routing.xml -->

create_framework/event_dispatcher.rst

@@ -138,8 +138,11 @@ the registration of a listener for the ``response`` event::
 
         $response->setContent($response->getContent().'GA CODE');
     });
+    
+    $controllerResolver = new ControllerResolver();
+    $argumentResolver = new ArgumentResolver();
 
-    $framework = new Simplex\Framework($dispatcher, $matcher, $resolver);
+    $framework = new Simplex\Framework($dispatcher, $matcher, $controllerResolver, $argumentResolver);
     $response = $framework->handle($request);
 
     $response->send();

forms.rst

@@ -562,10 +562,10 @@ the correct values of a number of field options.
     field ``nullable``). This is very useful, as your client-side validation will
     automatically match your validation rules.
 
-``max_length``
-    If the field is some sort of text field, then the ``max_length`` option can be
-    guessed from the validation constraints (if ``Length`` or ``Range`` is used) or
-    from the Doctrine metadata (via the field's length).
+``maxlength``
+    If the field is some sort of text field, then the ``maxlength`` option attribute
+    can be guessed from the validation constraints (if ``Length`` or ``Range`` is used)
+    or from the Doctrine metadata (via the field's length).
 
 .. caution::
 

page_creation.rst

@@ -68,12 +68,7 @@ random) number and prints it. To do that, create a "Controller class" and a
 Before diving into this, test it out! If you are using PHP's internal web server
 go to:
 
-    http://localhost:8000/app_dev.php/lucky/number
-
-.. tip::
-
-    If you're using the built-in PHP web-server, you can omit the ``app_dev.php``
-    part of the URL.
+    http://localhost:8000/lucky/number
 
 If you see a lucky number being printed back to you, congratulations! But before
 you run off to play the lottery, check out how this works. Remember the two steps

reference/configuration/security.rst

@@ -416,7 +416,14 @@ use_referer
 **type**: ``boolean`` **default**: ``false``
 
 If ``true``, the user is redirected to the value stored in the ``HTTP_REFERER``
-header when no previous URL was stored in the session.
+header when no previous URL was stored in the session. If the referrer URL is
+the same as the one generated with the ``login_path`` route, the user is
+redirected to the ``default_target_path`` to avoid a redirection loop.
+
+.. note::
+
+    For historical reasons, and to match the misspelling of the HTTP standard,
+    the option is called ``use_referer`` instead of ``use_referrer``.
 
 .. _reference-security-pbkdf2:
 

reference/dic_tags.rst

@@ -940,6 +940,10 @@ and :class:`Symfony\\Component\\Serializer\\Normalizer\\DenormalizerInterface`.
 
 For more details, see :doc:`/serializer`.
 
+The priorities of the default normalizers can be found in the
+:method:`Symfony\\Bundle\\FrameworkBundle\\DependencyInjection\\FrameworkExtension::registerSerializerConfiguration`
+method.
+
 swiftmailer.default.plugin
 --------------------------
 

reference/forms/types/collection.rst

@@ -277,6 +277,15 @@ form you have to set this option to true. However, existing collection entries
 will only be deleted if you have the allow_delete_ option enabled. Otherwise
 the empty values will be kept.
 
+.. caution::
+
+    The ``delete_empty`` option only removes items when the normalized value is
+    ``null``. If the nested `entry_type`_ is a compound form type, you must
+    either set the ``required`` option to ``false`` or set the ``empty_data``
+    option to ``null``. Both of these options can be set inside `entry_options`_.
+    Read about the :ref:`form's empty_data option <reference-form-option-empty-data>`
+    to learn why this is necessary.
+
 entry_options
 ~~~~~~~~~~~~~
 

reference/forms/types/date.rst

@@ -101,12 +101,14 @@ make the following changes::
         'attr' => ['class' => 'js-datepicker'],
     ));
 
-Assuming you're using jQuery, you can initialize the date picker via:
+Then, add the following JavaScript code in your template to initialize the date
+picker:
 
 .. code-block:: html
 
     <script>
         $(document).ready(function() {
+            // configure the bootstrap datepicker
             $('.js-datepicker').datepicker({
                 format: 'yyyy-mm-dd'
             });