Documented choice variables

Author: wouterj

reference/forms/types/checkbox.rst

@@ -48,11 +48,6 @@ Field Options
 
 .. include:: /reference/forms/types/options/value.rst.inc
 
-Variables
----------
-
-.. include:: /reference/forms/types/variables/checked.rst.inc
-
 Overridden options
 ------------------
 
@@ -82,3 +77,12 @@ These options inherit from the :doc:`form </reference/forms/types/form>` type:
 .. include:: /reference/forms/types/options/error_mapping.rst.inc
 
 .. include:: /reference/forms/types/options/mapped.rst.inc
+
+Form Variables
+--------------
+
+======== ============ ============================================
+Variable Type         Usage                                       
+======== ============ ============================================
+checked  ``Boolean``  Whether or not the current input is checked.
+======== ============ ============================================

reference/forms/types/choice.rst

@@ -156,3 +156,23 @@ These options inherit from the :doc:`form </reference/forms/types/form>` type:
 .. include:: /reference/forms/types/options/inherit_data.rst.inc
 
 .. include:: /reference/forms/types/options/by_reference.rst.inc
+
+Field Variables
+---------------
+
+====================== ============ ===========================================================
+Variable               Type         Usage                                                      
+====================== ============ ===========================================================
+multiple               ``Boolean``  The value of the `multiple`_ option                        
+expanded               ``Boolean``  The value of the `expanded`_ option                        
+preferred_choices      ``array``    A nested array containing the ``ChoiceView`` objects of    
+                                    choices which should be presented to the user with priority
+choices                ``array``    A nested array containing the ``ChoiceView`` objects of    
+                                    the remaining choices                                      
+separator              ``string``   The seperator to use between choice groups                 
+empty_value            ``mixed``    The empty value if not already in the list, otherwise      
+                                    ``null``                                                   
+is_selected            ``callable`` A callable which takes a ``ChoiceView`` and the value      
+                                    and returns if the choice is selected or not               
+empty_value_in_choices ``Boolean``  Whether the empty value is in the choice list              
+====================== ============ ===========================================================

reference/forms/types/radio.rst

@@ -34,11 +34,6 @@ If you want to have a Boolean field, use :doc:`checkbox </reference/forms/types/
 | Class       | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\RadioType` |
 +-------------+---------------------------------------------------------------------+
 
-Variables
----------
-
-.. include:: /reference/forms/types/variables/checked.rst.inc
-
 Inherited Options
 -----------------
 
@@ -68,3 +63,12 @@ These options inherit from the :doc:`form </reference/forms/types/form>` type:
 .. include:: /reference/forms/types/options/error_mapping.rst.inc
 
 .. include:: /reference/forms/types/options/mapped.rst.inc
+
+Form Variables
+--------------
+
+======== ============ ============================================
+Variable Type         Usage                                       
+======== ============ ============================================
+checked  ``Boolean``  Whether or not the current input is checked.
+======== ============ ============================================