Merge branch '3.3' into 3.4

xabbuh · xabbuh · commit 172e788e28f2 · 2017-07-21T17:51:10.000+02:00
* 3.3: (46 commits) [#8192] use path() in PHP templates Reworded the article about form login redirects Update Flex documentation with latest structure Explained the edge-case where the use_referer option doesn't work [#7572] fix wording [#7585] remove trailing whitespaces [#7585] minor rewording Fixed a typo Fixed a typo Update parent_services for tip consistency [#7685] use the method role Minor change Updating doc to specify priority of default normalizer [#7767] remove trailing space [#7767] replace "options" with "entry_options" [#7767] minor rewording [#8047] add inline code comment Fixed the issue in a different way Jquery datePicker syntax update Fix framework instantiation in event-dispatcher ...
diff --git a/components/http_foundation.rst b/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'
diff --git a/components/validator.rst b/components/validator.rst
@@ -46,6 +46,8 @@ characters long::
         }
     }
 
+The validator returns the list of violations.
+
 Retrieving a Validator Instance
 -------------------------------
 
diff --git a/components/workflow.rst b/components/workflow.rst
@@ -44,8 +44,8 @@ these statuses are called **places**. You can define the workflow like this::
     use Symfony\Component\Workflow\Workflow;
     use Symfony\Component\Workflow\MarkingStore\SingleStateMarkingStore;
 
-    $definition = new DefinitionBuilder();
-    $definition->addPlaces(['draft', 'review', 'rejected', 'published'])
+    $definitionBuilder = new DefinitionBuilder();
+    $definition = $definitionBuilder->addPlaces(['draft', 'review', 'rejected', 'published'])
         // Transitions are defined with a unique name, an origin place and a destination place
         ->addTransition(new Transition('to_review', 'draft', 'review'))
         ->addTransition(new Transition('publish', 'review', 'published'))
diff --git a/controller/service.rst b/controller/service.rst
@@ -24,20 +24,15 @@ 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
 
         // You need to use Sensio's annotation to specify a service id
         use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
         // ...
+        
+        use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 
         /**
          * @Route(service="app.hello_controller")
@@ -47,6 +42,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 -->
diff --git a/create_framework/event_dispatcher.rst b/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();
diff --git a/forms.rst b/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::
 
diff --git a/frontend/encore/babel.rst b/frontend/encore/babel.rst
@@ -19,13 +19,39 @@ Need to extend the Babel configuration further? The easiest way is via
         // first, install any presets you want to use (e.g. yarn add babel-preset-es2017)
         // then, modify the default Babel configuration
         .configureBabel(function(babelConfig) {
+            // add additional presets
             babelConfig.presets.push('es2017');
+
+            // no plugins are added by default, but you can add some
+            // babelConfig.plugins = ['styled-jsx/babel'];
         })
     ;
 
-You can also create a standard ``.babelrc`` file at the root of your project.
-Just make sure to configure it with all the presets you need: as soon as a
-``.babelrc`` is present, Encore can no longer add *any* Babel configuration for
-you!
+Creating a .babelrc File
+------------------------
+
+Instead of calling ``configureBabel()``, you could create a ``.babelrc`` file
+at the root of your project. This is a more "standard" way of configuring
+Babel, but it has a downside: as soon as a ``.babelrc`` file is present,
+**Encore can no longer add any Babel configuration for you**. For example,
+if you call ``Encore.enableReactPreset()``, the ``react`` preset will *not*
+automatically be added to Babel: you must add it yourself in ``.babelrc``.
+
+An example ``.babelrc`` file might look like this:
+
+.. code-block:: json
+
+    {
+        presets: [
+            ['env', {
+                modules: false,
+                targets: {
+                    browsers: '> 1%',
+                    uglify: true
+                },
+                useBuiltIns: true
+            }]
+        ]
+    }
 
 .. _`Babel`: http://babeljs.io/
diff --git a/page_creation.rst b/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
diff --git a/reference/configuration/security.rst b/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:
 
diff --git a/reference/dic_tags.rst b/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
 --------------------------
 
diff --git a/reference/forms/types/collection.rst b/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 `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
 ~~~~~~~~~~~~~
 
diff --git a/reference/forms/types/date.rst b/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'
             });
diff --git a/reference/forms/types/form.rst b/reference/forms/types/form.rst
@@ -71,6 +71,8 @@ option on the form.
 
 .. include:: /reference/forms/types/options/data_class.rst.inc
 
+.. _reference-form-option-empty-data:
+
 .. include:: /reference/forms/types/options/empty_data.rst.inc
     :end-before: DEFAULT_PLACEHOLDER
 
diff --git a/reference/forms/types/options/data.rst.inc b/reference/forms/types/options/data.rst.inc
@@ -20,5 +20,5 @@ an individual field, you can set it in the data option::
 
     The ``data`` option *always* overrides the value taken from the domain data
     (object) when rendering. This means the object value is also overriden when
-    the form edits an already persisted object, causing it to lose it's
+    the form edits an already persisted object, causing it to lose its
     persisted value when the form is submitted.
diff --git a/routing/scheme.rst b/routing/scheme.rst
@@ -48,17 +48,18 @@ the URI scheme via schemes:
 The above configuration forces the ``secure`` route to always use HTTPS.
 
 When generating the ``secure`` URL, and if the current scheme is HTTP, Symfony
-will automatically generate an absolute URL with HTTPS as the scheme:
+will automatically generate an absolute URL with HTTPS as the scheme, even when
+using the ``path()`` function:
 
 .. code-block:: twig
 
     {# If the current scheme is HTTPS #}
     {{ path('secure') }}
-    {# generates /secure #}
+    {# generates a relative URL: /secure #}
 
     {# If the current scheme is HTTP #}
     {{ path('secure') }}
-    {# generates https://example.com/secure #}
+    {# generates an absolute URL: https://example.com/secure #}
 
 The requirement is also enforced for incoming requests. If you try to access
 the ``/secure`` path with HTTP, you will automatically be redirected to the
diff --git a/security/form_login.rst b/security/form_login.rst
diff --git a/security/multiple_user_providers.rst b/security/multiple_user_providers.rst
diff --git a/service_container/3.3-di-changes.rst b/service_container/3.3-di-changes.rst
diff --git a/service_container/parent_services.rst b/service_container/parent_services.rst
diff --git a/setup/flex.rst b/setup/flex.rst
diff --git a/testing/insulating_clients.rst b/testing/insulating_clients.rst
diff --git a/validation/raw_values.rst b/validation/raw_values.rst

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ characters long::`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
	`49`	`+The validator returns the list of violations.`
	`50`	`+`
`49`	`51`	`Retrieving a Validator Instance`
`50`	`52`	`-------------------------------`
`51`	`53`