Skip to content

Commit 230b1f9

Browse files
weaverryanweaverryan
committed
Merge branch '2.2'
2 parents 8040775 + bab16bf commit 230b1f9

17 files changed

+199
-82
lines changed

‎book/performance.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ command line, and might become part of your deploy process:
6262
6363
php composer.phar dump-autoload --optimize
6464
65-
Internally, this builds the big class map array in ``vendor/composer/autoload_namespaces.php``.
65+
Internally, this builds the big class map array in ``vendor/composer/autoload_classmap.php``.
6666

6767
Caching the Autoloader with APC
6868
-------------------------------

‎reference/forms/types.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Form Types Reference
1313
types/choice
1414
types/collection
1515
types/country
16-
types/csrf
1716
types/date
1817
types/datetime
1918
types/email

‎reference/forms/types/birthday.rst

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,34 @@ This type is essentially the same as the :doc:`date</reference/forms/types/date>
1414
type, but with a more appropriate default for the `years`_ option. The `years`_
1515
option defaults to 120 years ago to the current year.
1616

17-
+----------------------+------------------------------------------------------------------------------------------------------------------------+
18-
| Underlying Data Type | can be ``DateTime``, ``string``, ``timestamp``, or ``array`` (see the :ref:`input option <form-reference-date-input>`) |
19-
+----------------------+------------------------------------------------------------------------------------------------------------------------+
20-
| Rendered as | can be three select boxes or 1 or 3 text boxes, based on the `widget`_ option |
21-
+----------------------+------------------------------------------------------------------------------------------------------------------------+
22-
| Options | - `years`_ |
23-
+----------------------+------------------------------------------------------------------------------------------------------------------------+
24-
| Inherited | - `widget`_ |
25-
| options | - `input`_ |
26-
| | - `months`_ |
27-
| | - `days`_ |
28-
| | - `format`_ |
29-
| | - `data_timezone`_ |
30-
| | - `user_timezone`_ |
31-
| | - `invalid_message`_ |
32-
| | - `invalid_message_parameters`_ |
33-
| | - `read_only`_ |
34-
| | - `disabled`_ |
35-
| | - `virtual`_ |
36-
+----------------------+------------------------------------------------------------------------------------------------------------------------+
37-
| Parent type | :doc:`date</reference/forms/types/date>` |
38-
+----------------------+------------------------------------------------------------------------------------------------------------------------+
39-
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\BirthdayType` |
40-
+----------------------+------------------------------------------------------------------------------------------------------------------------+
41-
42-
Field Options
43-
-------------
17+
+----------------------+-------------------------------------------------------------------------------+
18+
| Underlying Data Type | can be ``DateTime``, ``string``, ``timestamp``, or ``array`` |
19+
| | (see the :ref:`input option <form-reference-date-input>`) |
20+
+----------------------+-------------------------------------------------------------------------------+
21+
| Rendered as | can be three select boxes or 1 or 3 text boxes, based on the `widget`_ option |
22+
+----------------------+-------------------------------------------------------------------------------+
23+
| Overridden Options | - `years`_ |
24+
+----------------------+-------------------------------------------------------------------------------+
25+
| Inherited Options | - `widget`_ |
26+
| | - `input`_ |
27+
| | - `months`_ |
28+
| | - `days`_ |
29+
| | - `format`_ |
30+
| | - `data_timezone`_ |
31+
| | - `user_timezone`_ |
32+
| | - `invalid_message`_ |
33+
| | - `invalid_message_parameters`_ |
34+
| | - `read_only`_ |
35+
| | - `disabled`_ |
36+
| | - `virtual`_ |
37+
+----------------------+-------------------------------------------------------------------------------+
38+
| Parent type | :doc:`date</reference/forms/types/date>` |
39+
+----------------------+-------------------------------------------------------------------------------+
40+
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\BirthdayType` |
41+
+----------------------+-------------------------------------------------------------------------------+
42+
43+
Overridden Options
44+
------------------
4445

4546
years
4647
~~~~~

‎reference/forms/types/choice.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ option.
1919
| | - `expanded`_ |
2020
| | - `preferred_choices`_ |
2121
| | - `empty_value`_ |
22-
| | - `empty_data`_ |
23-
| | - `by_reference`_ |
2422
+-------------+-----------------------------------------------------------------------------+
2523
| Inherited | - `required`_ |
2624
| options | - `label`_ |
2725
| | - `read_only`_ |
2826
| | - `disabled`_ |
2927
| | - `error_bubbling`_ |
3028
| | - `virtual`_ |
29+
| | - `by_reference`_ |
30+
| | - `empty_data`_ |
3131
+-------------+-----------------------------------------------------------------------------+
3232
| Parent type | :doc:`form</reference/forms/types/form>` (if expanded), ``field`` otherwise |
3333
+-------------+-----------------------------------------------------------------------------+
@@ -105,10 +105,6 @@ can be created to supply the choices.
105105

106106
.. include:: /reference/forms/types/options/empty_value.rst.inc
107107

108-
.. include:: /reference/forms/types/options/empty_data.rst.inc
109-
110-
.. include:: /reference/forms/types/options/by_reference.rst.inc
111-
112108
Inherited options
113109
-----------------
114110

@@ -127,3 +123,7 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
127123
These options inherit from the :doc:`date</reference/forms/types/form>` type:
128124

129125
.. include:: /reference/forms/types/options/virtual.rst.inc
126+
127+
.. include:: /reference/forms/types/options/by_reference.rst.inc
128+
129+
.. include:: /reference/forms/types/options/empty_data.rst.inc

‎reference/forms/types/country.rst

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ you should just use the ``choice`` type directly.
2222
+-------------+-----------------------------------------------------------------------+
2323
| Rendered as | can be various tags (see :ref:`forms-reference-choice-tags`) |
2424
+-------------+-----------------------------------------------------------------------+
25+
| Overridden | - `choices`_ |
26+
| Options | |
27+
+-------------+-----------------------------------------------------------------------+
2528
| Inherited | - `multiple`_ |
2629
| options | - `expanded`_ |
2730
| | - `preferred_choices`_ |
@@ -37,6 +40,18 @@ you should just use the ``choice`` type directly.
3740
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\CountryType` |
3841
+-------------+-----------------------------------------------------------------------+
3942

43+
Overridden Options
44+
------------------
45+
46+
choices
47+
~~~~~~~
48+
49+
**default**: :method:`Symfony\\Component\\Locale\\Locale::getDisplayCountries`
50+
51+
The country type defaults the ``choices`` option to the all locales which are
52+
returned by :method:`Symfony\\Component\\Locale\\Locale::getDisplayCountries`.
53+
It uses the default locale to determine the language.
54+
4055
Inherited options
4156
-----------------
4257

@@ -60,4 +75,4 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
6075

6176
.. include:: /reference/forms/types/options/read_only.rst.inc
6277

63-
.. include:: /reference/forms/types/options/disabled.rst.inc
78+
.. include:: /reference/forms/types/options/disabled.rst.inc

‎reference/forms/types/csrf.rst

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎reference/forms/types/date.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ day, and year) or three select boxes (see the `widget_` option).
2929
| | - `data_timezone`_ |
3030
| | - `user_timezone`_ |
3131
+----------------------+-----------------------------------------------------------------------------+
32+
| Overridden Options | - `by_reference`_ |
33+
| | - `error_bubbling`_ |
34+
+----------------------+-----------------------------------------------------------------------------+
3235
| Inherited | - `invalid_message`_ |
3336
| options | - `invalid_message_parameters`_ |
3437
| | - `read_only`_ |
@@ -113,6 +116,21 @@ Alternatively, you can specify a string to be displayed for the "blank" value::
113116

114117
.. include:: /reference/forms/types/options/user_timezone.rst.inc
115118

119+
Overridden Options
120+
------------------
121+
122+
by_reference
123+
~~~~~~~~~~~~
124+
125+
**default**: ``false``
126+
127+
The ``DateTime`` classes are treated as immutable objects.
128+
129+
error_bubbling
130+
~~~~~~~~~~~~~~
131+
132+
**default**: ``false``
133+
116134
Inherited options
117135
-----------------
118136

‎reference/forms/types/entity.rst

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ objects from the database.
1818
| | - `query_builder`_ |
1919
| | - `em`_ |
2020
+-------------+------------------------------------------------------------------+
21+
| Overridden | - `choices` |
22+
| Options | - `choice_list` |
23+
+-------------+------------------------------------------------------------------+
2124
| Inherited | - `required`_ |
2225
| options | - `label`_ |
2326
| | - `multiple`_ |
@@ -121,6 +124,22 @@ em
121124
If specified, the specified entity manager will be used to load the choices
122125
instead of the default entity manager.
123126

127+
Overridden Options
128+
------------------
129+
130+
choices
131+
~~~~~~~
132+
133+
**default**: ``null``
134+
135+
choice_list
136+
~~~~~~~~~~~
137+
138+
**default**: all entities selected
139+
140+
The choices will default to all entities selected with one of the options that
141+
are documented above.
142+
124143
Inherited options
125144
-----------------
126145

‎reference/forms/types/hidden.rst

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,39 @@ The hidden type represents a hidden input field.
99
+-------------+----------------------------------------------------------------------+
1010
| Rendered as | ``input`` ``hidden`` field |
1111
+-------------+----------------------------------------------------------------------+
12-
| Inherited | - ``data`` |
13-
| options | - ``property_path`` |
12+
| Overridden | - `required`_ |
13+
| Options | - `error_bubbling`_ |
14+
+-------------+----------------------------------------------------------------------+
15+
| Inherited | - `data`_ |
16+
| options | - `property_path`_ |
1417
+-------------+----------------------------------------------------------------------+
1518
| Parent type | :doc:`field</reference/forms/types/field>` |
1619
+-------------+----------------------------------------------------------------------+
1720
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\HiddenType` |
1821
+-------------+----------------------------------------------------------------------+
1922

23+
Overridden Options
24+
------------------
25+
26+
required
27+
~~~~~~~~
28+
29+
**default**: ``false``
30+
31+
Hidden fields cannot have a required attribute.
32+
33+
error_bubbling
34+
~~~~~~~~~~~~~~
35+
36+
**default**: ``true``
37+
38+
Pass errors to the root form, otherwise they will not be visible.
39+
2040
Inherited Options
2141
-----------------
2242

2343
These options inherit from the :doc:`field</reference/forms/types/field>` type:
2444

2545
.. include:: /reference/forms/types/options/data.rst.inc
2646

27-
.. include:: /reference/forms/types/options/property_path.rst.inc
47+
.. include:: /reference/forms/types/options/property_path.rst.inc

‎reference/forms/types/language.rst

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ you should just use the ``choice`` type directly.
2323
+-------------+------------------------------------------------------------------------+
2424
| Rendered as | can be various tags (see :ref:`forms-reference-choice-tags`) |
2525
+-------------+------------------------------------------------------------------------+
26+
| Overridden | - `choices`_ |
27+
| Options | |
28+
+-------------+------------------------------------------------------------------------+
2629
| Inherited | - `multiple`_ |
2730
| options | - `expanded`_ |
2831
| | - `preferred_choices`_ |
@@ -38,6 +41,18 @@ you should just use the ``choice`` type directly.
3841
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\LanguageType` |
3942
+-------------+------------------------------------------------------------------------+
4043

44+
Overridden Options
45+
------------------
46+
47+
choices
48+
~~~~~~~
49+
50+
**default**: :method:`Symfony\\Component\\Locale\\Locale::getDisplayLanguages`
51+
52+
The choices option defaults to all languages returned by
53+
:method:`Symfony\\Component\\Locale\\Locale::getDisplayLanguages`. It uses the
54+
default locale to specify the language.
55+
4156
Inherited Options
4257
-----------------
4358

@@ -61,4 +76,4 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
6176

6277
.. include:: /reference/forms/types/options/read_only.rst.inc
6378

64-
.. include:: /reference/forms/types/options/disabled.rst.inc
79+
.. include:: /reference/forms/types/options/disabled.rst.inc

0 commit comments

Comments
 (0)