Merge branch '2.7' into 2.8

javiereguiluz · javiereguiluz · commit 89bcd827a965 · 2018-01-20T12:14:45.000+01:00
* 2.7:
  Use escaped backslashes
  Adding the missing attr option to the ChoiceType
  Update choice.rst
  Minor fixes in the bundles article
diff --git a/bundles.rst b/bundles.rst
@@ -67,7 +67,7 @@ Creating a Bundle
 `SensioGeneratorBundle`_ is an optional bundle that includes commands to create
 different elements of your application, such as bundles. If you create lots of
 bundles, consider using it. However, this section creates and enables a new
-bundle by hand to show how simple is to do it.
+bundle by hand 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
@@ -178,4 +178,4 @@ Learn more
     bundles/*
 
 .. _`third-party bundles`: https://github.com/search?q=topic%3Asymfony-bundle&type=Repositories
-.. _`SensioGeneratorBundle`: https://github.com/sensiolabs/SensioGeneratorBundle
+.. _`SensioGeneratorBundle`: https://symfony.com/doc/current/bundles/SensioGeneratorBundle/index.html
diff --git a/reference/forms/types/choice.rst b/reference/forms/types/choice.rst
@@ -31,8 +31,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`_                                                            |
@@ -112,6 +113,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';
@@ -340,6 +342,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
diff --git a/routing.rst b/routing.rst
@@ -689,7 +689,7 @@ Troubleshooting
 
 Here are some common errors you might see while working with routing:
 
-    Controller "AppBundle\Controller\BlogController::showAction()" requires that you
+    Controller "AppBundle\\Controller\\BlogController::showAction()" requires that you
     provide a value for the "$slug" argument.
 
 This happens when your controller method has an argument (e.g. ``$slug``)::
