Skip to content

Commit 5480056

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '5.3' into 5.4
* 5.3: [Form] Remove repeated options in Form types
2 parents 233beab + 37cf7ce commit 5480056

38 files changed

+0
-949
lines changed

‎reference/forms/types/birthday.rst‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,6 @@ option defaults to 120 years ago to the current year.
2020
+---------------------------+-------------------------------------------------------------------------------+
2121
| Rendered as | can be three select boxes or 1 or 3 text boxes, based on the `widget`_ option |
2222
+---------------------------+-------------------------------------------------------------------------------+
23-
| Overridden options | - `invalid_message`_ |
24-
| | - `years`_ |
25-
+---------------------------+-------------------------------------------------------------------------------+
26-
| Inherited options | from the :doc:`DateType </reference/forms/types/date>`: |
27-
| | |
28-
| | - `choice_translation_domain`_ |
29-
| | - `days`_ |
30-
| | - `placeholder`_ |
31-
| | - `format`_ |
32-
| | - `input`_ |
33-
| | - `input_format`_ |
34-
| | - `model_timezone`_ |
35-
| | - `months`_ |
36-
| | - `view_timezone`_ |
37-
| | - `widget`_ |
38-
| | |
39-
| | from the :doc:`FormType </reference/forms/types/form>`: |
40-
| | |
41-
| | - `attr`_ |
42-
| | - `data`_ |
43-
| | - `disabled`_ |
44-
| | - `help`_ |
45-
| | - `help_attr`_ |
46-
| | - `help_html`_ |
47-
| | - `inherit_data`_ |
48-
| | - `invalid_message_parameters`_ |
49-
| | - `mapped`_ |
50-
| | - `row_attr`_ |
51-
+---------------------------+-------------------------------------------------------------------------------+
5223
| Default invalid message | Please enter a valid birthdate. |
5324
+---------------------------+-------------------------------------------------------------------------------+
5425
| Legacy invalid message | The value {{ value }} is not valid. |

‎reference/forms/types/button.rst‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@ A simple, non-responsive button.
99
+----------------------+----------------------------------------------------------------------+
1010
| Rendered as | ``button`` tag |
1111
+----------------------+----------------------------------------------------------------------+
12-
| Inherited | - `attr`_ |
13-
| options | - `attr_translation_parameters`_ |
14-
| | - `disabled`_ |
15-
| | - `label`_ |
16-
| | - `label_html`_ |
17-
| | - `label_translation_parameters`_ |
18-
| | - `row_attr`_ |
19-
| | - `translation_domain`_ |
20-
+----------------------+----------------------------------------------------------------------+
2112
| Parent type | none |
2213
+----------------------+----------------------------------------------------------------------+
2314
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\ButtonType` |

‎reference/forms/types/checkbox.rst‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,6 @@ if you want to handle submitted values like "0" or "false").
1414
+---------------------------+------------------------------------------------------------------------+
1515
| Rendered as | ``input`` ``checkbox`` field |
1616
+---------------------------+------------------------------------------------------------------------+
17-
| Options | - `false_values`_ |
18-
| | - `value`_ |
19-
+---------------------------+------------------------------------------------------------------------+
20-
| Overridden options | - `compound`_ |
21-
| | - `empty_data`_ |
22-
| | - `invalid_message`_ |
23-
+---------------------------+------------------------------------------------------------------------+
24-
| Inherited options | - `attr`_ |
25-
| | - `data`_ |
26-
| | - `disabled`_ |
27-
| | - `error_bubbling`_ |
28-
| | - `error_mapping`_ |
29-
| | - `help`_ |
30-
| | - `help_attr`_ |
31-
| | - `help_html`_ |
32-
| | - `label`_ |
33-
| | - `label_attr`_ |
34-
| | - `label_format`_ |
35-
| | - `mapped`_ |
36-
| | - `required`_ |
37-
| | - `row_attr`_ |
38-
+---------------------------+------------------------------------------------------------------------+
3917
| Default invalid message | The checkbox has an invalid value. |
4018
+---------------------------+------------------------------------------------------------------------+
4119
| Legacy invalid message | The value {{ value }} is not valid. |

‎reference/forms/types/choice.rst‎

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -12,47 +12,6 @@ To use this field, you must specify *either* ``choices`` or ``choice_loader`` op
1212
+---------------------------+----------------------------------------------------------------------+
1313
| Rendered as | can be various tags (see below) |
1414
+---------------------------+----------------------------------------------------------------------+
15-
| Options | - `choices`_ |
16-
| | - `choice_attr`_ |
17-
| | - `choice_filter`_ |
18-
| | - `choice_label`_ |
19-
| | - `choice_loader`_ |
20-
| | - `choice_name`_ |
21-
| | - `choice_translation_domain`_ |
22-
| | - `choice_translation_parameters`_ |
23-
| | - `choice_value`_ |
24-
| | - `expanded`_ |
25-
| | - `group_by`_ |
26-
| | - `multiple`_ |
27-
| | - `placeholder`_ |
28-
| | - `preferred_choices`_ |
29-
+---------------------------+----------------------------------------------------------------------+
30-
| Overridden options | - `compound`_ |
31-
| | - `empty_data`_ |
32-
| | - `error_bubbling`_ |
33-
| | - `trim`_ |
34-
| | - `invalid_message`_ |
35-
+---------------------------+----------------------------------------------------------------------+
36-
| Inherited options | - `attr`_ |
37-
| | - `by_reference`_ |
38-
| | - `data`_ |
39-
| | - `disabled`_ |
40-
| | - `error_mapping`_ |
41-
| | - `help`_ |
42-
| | - `help_attr`_ |
43-
| | - `help_html`_ |
44-
| | - `inherit_data`_ |
45-
| | - `label`_ |
46-
| | - `label_attr`_ |
47-
| | - `label_format`_ |
48-
| | - `mapped`_ |
49-
| | - `required`_ |
50-
| | - `row_attr`_ |
51-
| | - `translation_domain`_ |
52-
| | - `label_translation_parameters`_ |
53-
| | - `attr_translation_parameters`_ |
54-
| | - `help_translation_parameters`_ |
55-
+---------------------------+----------------------------------------------------------------------+
5615
| Default invalid message | The selected choice is invalid. |
5716
+---------------------------+----------------------------------------------------------------------+
5817
| Legacy invalid message | The value {{ value }} is not valid. |

‎reference/forms/types/collection.rst‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,6 @@ photos).
1414
+---------------------------+--------------------------------------------------------------------------+
1515
| Rendered as | depends on the `entry_type`_ option |
1616
+---------------------------+--------------------------------------------------------------------------+
17-
| Options | - `allow_add`_ |
18-
| | - `allow_delete`_ |
19-
| | - `delete_empty`_ |
20-
| | - `entry_options`_ |
21-
| | - `entry_type`_ |
22-
| | - `prototype`_ |
23-
| | - `prototype_data`_ |
24-
| | - `prototype_name`_ |
25-
+---------------------------+--------------------------------------------------------------------------+
26-
| Overridden options | - `invalid_message`_ |
27-
+---------------------------+--------------------------------------------------------------------------+
28-
| Inherited options | - `attr`_ |
29-
| | - `by_reference`_ |
30-
| | - `empty_data`_ |
31-
| | - `error_bubbling`_ |
32-
| | - `error_mapping`_ |
33-
| | - `help`_ |
34-
| | - `help_attr`_ |
35-
| | - `help_html`_ |
36-
| | - `label`_ |
37-
| | - `label_attr`_ |
38-
| | - `label_format`_ |
39-
| | - `mapped`_ |
40-
| | - `required`_ |
41-
| | - `row_attr`_ |
42-
+---------------------------+--------------------------------------------------------------------------+
4317
| Default invalid message | The collection is invalid. |
4418
+---------------------------+--------------------------------------------------------------------------+
4519
| Legacy invalid message | The value {{ value }} is not valid. |

‎reference/forms/types/color.rst‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,6 @@ element.
2121
+---------------------------+---------------------------------------------------------------------+
2222
| Overridden options | - `invalid_message`_ |
2323
+---------------------------+---------------------------------------------------------------------+
24-
| Inherited options | - `attr`_ |
25-
| | - `data`_ |
26-
| | - `disabled`_ |
27-
| | - `empty_data`_ |
28-
| | - `error_bubbling`_ |
29-
| | - `error_mapping`_ |
30-
| | - `help`_ |
31-
| | - `help_attr`_ |
32-
| | - `help_html`_ |
33-
| | - `label`_ |
34-
| | - `label_attr`_ |
35-
| | - `label_format`_ |
36-
| | - `mapped`_ |
37-
| | - `required`_ |
38-
| | - `row_attr`_ |
39-
| | - `trim`_ |
40-
+---------------------------+---------------------------------------------------------------------+
4124
| Default invalid message | Please select a valid color. |
4225
+---------------------------+---------------------------------------------------------------------+
4326
| Legacy invalid message | The value {{ value }} is not valid. |

0 commit comments

Comments
 (0)