Merge branch '3.4' into 4.2

* 3.4:
  fix rst link syntax
  Renamed the values in callback functions of ChoiceType to make them more consistent with eachother and the code.

Author: xabbuh

contributing/code/pull_requests.rst

@@ -376,9 +376,9 @@ to ensure a constructive feedback process.
 If you think someone fails to keep this advice in mind and you want another
 perspective, please join the #contribs channel on `Symfony Slack`_. If you
 receive feedback you find abusive please contact the
-:doc:`CARE team</contributing/code_of_conduct/care_team.rst>`.
+:doc:`CARE team </contributing/code_of_conduct/care_team>`.
 
-The :doc:`core team <contributing/code/core_team>` is responsible for deciding
+The :doc:`core team </contributing/code/core_team>` is responsible for deciding
 which PR gets merged, so their feedback is the most relevant. So do not feel
 pressured to refactor your code immediately when someone provides feedback.
 

reference/forms/types/choice.rst

@@ -97,18 +97,17 @@ method::
             new Category('Cat3'),
             new Category('Cat4'),
         ],
-        'choice_label' => function($category, $key, $value) {
-            /** @var Category $category */
+        'choice_label' => function(Category $category, $key, $value) {
             return strtoupper($category->getName());
         },
-        'choice_attr' => function($category, $key, $value) {
+        'choice_attr' => function(Category $category, $key, $value) {
             return ['class' => 'category_'.strtolower($category->getName())];
         },
-        'group_by' => function($category, $key, $value) {
+        'group_by' => function(Category $category, $key, $value) {
             // randomly assign things into 2 groups
             return rand(0, 1) == 1 ? 'Group A' : 'Group B';
         },
-        'preferred_choices' => function($category, $key, $value) {
+        'preferred_choices' => function(Category $category, $key, $value) {
             return $category->getName() == 'Cat2' || $category->getName() == 'Cat3';
         },
     ]);

reference/forms/types/options/choice_attr.rst.inc

@@ -19,7 +19,7 @@ If an array, the keys of the ``choices`` array must be used as keys::
             'No' => false,
             'Maybe' => null,
         ],
-        'choice_attr' => function($choiceValue, $key, $value) {
+        'choice_attr' => function($choice, $key, $value) {
             // adds a class like attending_yes, attending_no, etc
             return ['class' => 'attending_'.strtolower($key)];
         },

reference/forms/types/options/choice_label.rst.inc

@@ -16,8 +16,8 @@ more control::
             'no' => false,
             'maybe' => null,
         ],
-        'choice_label' => function ($value, $key, $choiceValue) {
-            if (true === $value) {
+        'choice_label' => function ($choice, $key, $value) {
+            if (true === $choice) {
                 return 'Definitely!';
             }
 
@@ -28,8 +28,8 @@ more control::
         },
     ]);
 
-This method is called for *each* choice, passing you the ``$value`` and 
-``$key`` from the choices array (additional ``$choiceValue`` is related to `choice_value`_). 
+This method is called for *each* choice, passing you the ``$choice`` and
+``$key`` from the choices array (additional ``$value`` is related to `choice_value`_).
 This will give you:
 
 .. image:: /_images/reference/form/choice-example2.png

reference/forms/types/options/group_by.rst.inc

@@ -22,8 +22,8 @@ Take the following example::
             '1 week' => new \DateTime('+1 week'),
             '1 month' => new \DateTime('+1 month'),
         ],
-        'group_by' => function($choiceValue, $key, $value) {
-            if ($choiceValue <= new \DateTime('+3 days')) {
+        'group_by' => function($choice, $key, $value) {
+            if ($choice <= new \DateTime('+3 days')) {
                 return 'Soon';
             } else {
                 return 'Later';

reference/forms/types/options/preferred_choices.rst.inc

@@ -33,9 +33,9 @@ be especially useful if your values are objects::
             '1 week' => new \DateTime('+1 week'),
             '1 month' => new \DateTime('+1 month'),
         ],
-        'preferred_choices' => function ($value, $key) {
+        'preferred_choices' => function ($choice, $key, $value) {
             // prefer options within 3 days
-            return $value <= new \DateTime('+3 days');
+            return $choice <= new \DateTime('+3 days');
         },
     ]);