Merge branch '3.4' into 4.0

* 3.4:
  Use escaped backslashes
  Don't mention the UserInterface type-hinting
  Add information about default value for decoration_priority
  Adding the missing attr option to the ChoiceType
  Update choice.rst
  Minor fixes in the bundles article

Author: javiereguiluz

bundles.rst

@@ -44,7 +44,7 @@ file::
 Creating a Bundle
 -----------------
 
-This section creates and enables a new bundle to show how simple is to do it.
+This section creates and enables a new bundle to show how simple it is to do it.
 The new bundle is called AcmeTestBundle, where the ``Acme`` portion is just a
 dummy name that should be replaced by some "vendor" name that represents you or
 your organization (e.g. ABCTestBundle for some company named ``ABC``).

reference/forms/types/choice.rst

@@ -29,8 +29,9 @@ To use this field, you must specify *either* ``choices`` or ``choice_loader`` op
 | options     | - `empty_data`_                                                              |
 |             | - `error_bubbling`_                                                          |
 +-------------+------------------------------------------------------------------------------+
-| Inherited   | - `by_reference`_                                                            |
-| options     | - `data`_                                                                    |
+| Inherited   | - `attr`_                                                                    |
+| options     | - `by_reference`_                                                            |
+|             | - `data`_                                                                    |
 |             | - `disabled`_                                                                |
 |             | - `error_mapping`_                                                           |
 |             | - `inherit_data`_                                                            |
@@ -98,6 +99,7 @@ method::
         'choice_attr' => function($category, $key, $index) {
             return ['class' => 'category_'.strtolower($category->getName())];
         },
+        
         'group_by' => function($category, $key, $index) {
             // randomly assign things into 2 groups
             return rand(0, 1) == 1 ? 'Group A' : 'Group B';
@@ -252,6 +254,8 @@ Inherited Options
 
 These options inherit from the :doc:`FormType </reference/forms/types/form>`:
 
+.. include:: /reference/forms/types/options/attr.rst.inc
+
 .. include:: /reference/forms/types/options/by_reference.rst.inc
 
 .. include:: /reference/forms/types/options/data.rst.inc

routing.rst

@@ -616,7 +616,7 @@ Troubleshooting
 
 Here are some common errors you might see while working with routing:
 
-    Controller "App\Controller\BlogController::show()" requires that you
+    Controller "App\\Controller\\BlogController::show()" requires that you
     provide a value for the "$slug" argument.
 
 This happens when your controller method has an argument (e.g. ``$slug``)::

security.rst

@@ -1007,16 +1007,14 @@ If you still prefer to use traditional ACLs, refer to the `Symfony ACL bundle`_.
 -----------------------------
 
 After authentication, the ``User`` object of the current user can be accessed
-via the ``security.token_storage`` service. From inside a controller, this will
-look like::
+via the ``getUser()`` shortcut (which uses the ``security.token_storage``
+service). From inside a controller, this will look like::
 
     public function index()
     {
         $this->denyAccessUnlessGranted('IS_AUTHENTICATED_FULLY');
 
         $user = $this->getUser();
-        // or you can also type-hint a method argument with this class:
-        // Symfony\Component\Security\Core\User\UserInterface (e.g. "UserInterface $user")
     }
 
 .. tip::
@@ -1044,14 +1042,7 @@ It's important to check if the user is authenticated first. If they're not,
 ``$user`` will either be ``null`` or the string ``anon.``. Wait, what? Yes,
 this is a quirk. If you're not logged in, the user is technically the string
 ``anon.``, though the ``getUser()`` controller shortcut converts this to
-``null`` for convenience. When type-hinting the
-:class:`Symfony\\Component\\Security\\Core\\User\\UserInterface\\UserInterface`
-and being logged-in is optional, you can allow a null value for the argument::
-
-    public function index(UserInterface $user = null)
-    {
-        // $user is null when not logged-in or anon.
-    }
+``null`` for convenience.
 
 The point is this: always check to see if the user is logged in before using
 the User object, and use the ``isGranted()`` method (or
@@ -1065,6 +1056,25 @@ the User object, and use the ``isGranted()`` method (or
         // ...
     }
 
+.. note::
+
+    An alternative way to get the current user in a controller is to type-hint
+    the controller argument with
+    :class:`Symfony\\Component\\Security\\Core\\User\\UserInterface\\UserInterface`
+    (and default it to ``null`` if being logged-in is optional)::
+
+        use Symfony\Component\Security\Core\User\UserInterface\UserInterface;
+
+        public function indexAction(UserInterface $user = null)
+        {
+            // $user is null when not logged-in or anon.
+        }
+
+    This is only recommended for experienced developers who don't extend from the
+    :ref:`Symfony base controller <the-base-controller-class-services>` and
+    don't use the :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerTrait`
+    either. Otherwise, it's recommended to keep using the ``getUser()`` shortcut.
+
 Retrieving the User in a Template
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

service_container/service_decoration.rst

@@ -179,9 +179,9 @@ replaces the ``app.mailer`` service. The old ``app.mailer`` service is renamed t
 Decoration Priority
 -------------------
 
-If you want to apply more than one decorator to a service, you can control their
-order by configuring the priority of decoration, this can be any integer number
-(decorators with higher priorities will be applied first).
+When applying multiple decorators to a service, you can control their order with
+the ``decoration_priority`` option. Its value is an integer that defaults to
+``0`` and higher priorities mean that decorators will be applied earlier.
 
 .. configuration-block::