Skip to content

Commit 7212d84

Browse files
committed
[2.1] Removing old references to the deprecated "field" type, replacing with "form" type
1 parent 70c2ae0 commit 7212d84

21 files changed

+31
-71
lines changed

reference/forms/types/birthday.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ These options inherit from the :doc:`date</reference/forms/types/date>` type:
7171

7272
.. include:: /reference/forms/types/options/user_timezone.rst.inc
7373

74-
These options inherit from the :doc:`date</reference/forms/types/field>` type:
74+
These options inherit from the :doc:`date</reference/forms/types/form>` type:
7575

7676
.. include:: /reference/forms/types/options/invalid_message.rst.inc
7777

@@ -81,8 +81,6 @@ These options inherit from the :doc:`date</reference/forms/types/field>` type:
8181

8282
.. include:: /reference/forms/types/options/disabled.rst.inc
8383

84-
These options inherit from the :doc:`date</reference/forms/types/form>` type:
85-
8684
.. include:: /reference/forms/types/options/mapped.rst.inc
8785

8886
.. include:: /reference/forms/types/options/virtual.rst.inc

reference/forms/types/checkbox.rst

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if the box is unchecked, the value will be set to false.
2020
| | - `error_bubbling`_ |
2121
| | - `mapped`_ |
2222
+-------------+------------------------------------------------------------------------+
23-
| Parent type | :doc:`field</reference/forms/types/field>` |
23+
| Parent type | :doc:`field</reference/forms/types/form>` |
2424
+-------------+------------------------------------------------------------------------+
2525
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\CheckboxType` |
2626
+-------------+------------------------------------------------------------------------+
@@ -49,7 +49,7 @@ not affect the value that's set on your object.
4949
Inherited options
5050
-----------------
5151

52-
These options inherit from the :doc:`field</reference/forms/types/field>` type:
52+
These options inherit from the :doc:`field</reference/forms/types/form>` type:
5353

5454
.. include:: /reference/forms/types/options/required.rst.inc
5555

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

6262
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
6363

64-
These options inherit from the :doc:`date</reference/forms/types/form>` type:
65-
66-
.. include:: /reference/forms/types/options/mapped.rst.inc
64+
.. include:: /reference/forms/types/options/mapped.rst.inc

reference/forms/types/choice.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ can be created to supply the choices.
109109
Inherited options
110110
-----------------
111111

112-
These options inherit from the :doc:`field</reference/forms/types/field>` type:
112+
These options inherit from the :doc:`field</reference/forms/types/form>` type:
113113

114114
.. include:: /reference/forms/types/options/required.rst.inc
115115

@@ -121,8 +121,6 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
121121

122122
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
123123

124-
These options inherit from the :doc:`date</reference/forms/types/form>` type:
125-
126124
.. include:: /reference/forms/types/options/mapped.rst.inc
127125

128126
.. include:: /reference/forms/types/options/virtual.rst.inc

reference/forms/types/date.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ error_bubbling
135135
Inherited options
136136
-----------------
137137

138-
These options inherit from the :doc:`field</reference/forms/types/field>` type:
138+
These options inherit from the :doc:`field</reference/forms/types/form>` type:
139139

140140
.. include:: /reference/forms/types/options/invalid_message.rst.inc
141141

@@ -145,8 +145,6 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
145145

146146
.. include:: /reference/forms/types/options/disabled.rst.inc
147147

148-
These options inherit from the :doc:`date</reference/forms/types/form>` type:
149-
150148
.. include:: /reference/forms/types/options/mapped.rst.inc
151149

152150
.. include:: /reference/forms/types/options/virtual.rst.inc

reference/forms/types/datetime.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ for more details.
104104
Inherited options
105105
-----------------
106106

107-
These options inherit from the :doc:`field</reference/forms/types/field>` type:
107+
These options inherit from the :doc:`field</reference/forms/types/form>` type:
108108

109109
.. include:: /reference/forms/types/options/invalid_message.rst.inc
110110

@@ -114,8 +114,6 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
114114

115115
.. include:: /reference/forms/types/options/disabled.rst.inc
116116

117-
These options inherit from the :doc:`date</reference/forms/types/form>` type:
118-
119117
.. include:: /reference/forms/types/options/mapped.rst.inc
120118

121119
.. include:: /reference/forms/types/options/virtual.rst.inc

reference/forms/types/email.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ The ``email`` field is a text field that is rendered using the HTML5
1919
| | - `error_bubbling`_ |
2020
| | - `mapped`_ |
2121
+-------------+---------------------------------------------------------------------+
22-
| Parent type | :doc:`field</reference/forms/types/field>` |
22+
| Parent type | :doc:`field</reference/forms/types/form>` |
2323
+-------------+---------------------------------------------------------------------+
2424
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\EmailType` |
2525
+-------------+---------------------------------------------------------------------+
2626

2727
Inherited Options
2828
-----------------
2929

30-
These options inherit from the :doc:`field</reference/forms/types/field>` type:
30+
These options inherit from the :doc:`field</reference/forms/types/form>` type:
3131

3232
.. include:: /reference/forms/types/options/max_length.rst.inc
3333

@@ -43,6 +43,4 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
4343

4444
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
4545

46-
These options inherit from the :doc:`date</reference/forms/types/form>` type:
47-
4846
.. include:: /reference/forms/types/options/mapped.rst.inc

reference/forms/types/entity.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ These options inherit from the :doc:`choice</reference/forms/types/choice>` type
161161

162162
.. include:: /reference/forms/types/options/empty_value.rst.inc
163163

164-
These options inherit from the :doc:`field</reference/forms/types/field>` type:
164+
These options inherit from the :doc:`field</reference/forms/types/form>` type:
165165

166166
.. include:: /reference/forms/types/options/required.rst.inc
167167

@@ -173,6 +173,4 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
173173

174174
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
175175

176-
These options inherit from the :doc:`date</reference/forms/types/form>` type:
177-
178176
.. include:: /reference/forms/types/options/mapped.rst.inc

reference/forms/types/file.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ how to manage a file upload associated with a Doctrine entity.
8383
Inherited options
8484
-----------------
8585

86-
These options inherit from the :doc:`field</reference/forms/types/field>` type:
86+
These options inherit from the :doc:`field</reference/forms/types/form>` type:
8787

8888
.. include:: /reference/forms/types/options/required.rst.inc
8989

@@ -95,6 +95,4 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
9595

9696
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
9797

98-
These options inherit from the :doc:`date</reference/forms/types/form>` type:
99-
10098
.. include:: /reference/forms/types/options/mapped.rst.inc

reference/forms/types/hidden.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The hidden type represents a hidden input field.
1616
| options | - `property_path`_ |
1717
| | - `mapped`_ |
1818
+-------------+----------------------------------------------------------------------+
19-
| Parent type | :doc:`field</reference/forms/types/field>` |
19+
| Parent type | :doc:`field</reference/forms/types/form>` |
2020
+-------------+----------------------------------------------------------------------+
2121
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\HiddenType` |
2222
+-------------+----------------------------------------------------------------------+

reference/forms/types/integer.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ integers. By default, all non-integer values (e.g. 6.78) will round down (e.g. 6
2727
| | - `invalid_message_parameters`_ |
2828
| | - `mapped`_ |
2929
+-------------+-----------------------------------------------------------------------+
30-
| Parent type | :doc:`field</reference/forms/types/field>` |
30+
| Parent type | :doc:`field</reference/forms/types/form>` |
3131
+-------------+-----------------------------------------------------------------------+
3232
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\IntegerType` |
3333
+-------------+-----------------------------------------------------------------------+
@@ -61,7 +61,7 @@ on the :class:`Symfony\\Component\\Form\\Extension\\Core\\DataTransformer\\Integ
6161
Inherited options
6262
-----------------
6363

64-
These options inherit from the :doc:`field</reference/forms/types/field>` type:
64+
These options inherit from the :doc:`field</reference/forms/types/form>` type:
6565

6666
.. include:: /reference/forms/types/options/required.rst.inc
6767

@@ -77,6 +77,4 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
7777

7878
.. include:: /reference/forms/types/options/invalid_message_parameters.rst.inc
7979

80-
These options inherit from the :doc:`date</reference/forms/types/form>` type:
81-
8280
.. include:: /reference/forms/types/options/mapped.rst.inc

reference/forms/types/money.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ how the input and output of the data is handled.
2828
| | - `invalid_message_parameters`_ |
2929
| | - `mapped`_ |
3030
+-------------+---------------------------------------------------------------------+
31-
| Parent type | :doc:`field</reference/forms/types/field>` |
31+
| Parent type | :doc:`field</reference/forms/types/form>` |
3232
+-------------+---------------------------------------------------------------------+
3333
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\MoneyType` |
3434
+-------------+---------------------------------------------------------------------+
@@ -82,7 +82,7 @@ to ``0``).
8282
Inherited Options
8383
-----------------
8484

85-
These options inherit from the :doc:`field</reference/forms/types/field>` type:
85+
These options inherit from the :doc:`field</reference/forms/types/form>` type:
8686

8787
.. include:: /reference/forms/types/options/required.rst.inc
8888

@@ -98,8 +98,6 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
9898

9999
.. include:: /reference/forms/types/options/invalid_message_parameters.rst.inc
100100

101-
These options inherit from the :doc:`date</reference/forms/types/form>` type:
102-
103101
.. include:: /reference/forms/types/options/mapped.rst.inc
104102

105103
.. _`3 letter ISO 4217 code`: http://en.wikipedia.org/wiki/ISO_4217

reference/forms/types/number.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ you want to use for your number.
2424
| | - `invalid_message_parameters`_ |
2525
| | - `mapped`_ |
2626
+-------------+----------------------------------------------------------------------+
27-
| Parent type | :doc:`field</reference/forms/types/field>` |
27+
| Parent type | :doc:`field</reference/forms/types/form>` |
2828
+-------------+----------------------------------------------------------------------+
2929
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\NumberType` |
3030
+-------------+----------------------------------------------------------------------+
@@ -80,7 +80,7 @@ option is a constant on the :class:`Symfony\\Component\\Form\\Extension\\Core\\D
8080
Inherited Options
8181
-----------------
8282

83-
These options inherit from the :doc:`field</reference/forms/types/field>` type:
83+
These options inherit from the :doc:`field</reference/forms/types/form>` type:
8484

8585
.. include:: /reference/forms/types/options/required.rst.inc
8686

@@ -96,6 +96,4 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
9696

9797
.. include:: /reference/forms/types/options/invalid_message_parameters.rst.inc
9898

99-
These options inherit from the :doc:`date</reference/forms/types/form>` type:
100-
10199
.. include:: /reference/forms/types/options/mapped.rst.inc

reference/forms/types/password.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Put simply, if for some reason you want to render your password field
4343
Inherited Options
4444
-----------------
4545

46-
These options inherit from the :doc:`field</reference/forms/types/field>` type:
46+
These options inherit from the :doc:`field</reference/forms/types/form>` type:
4747

4848
.. include:: /reference/forms/types/options/max_length.rst.inc
4949

@@ -59,6 +59,4 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
5959

6060
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
6161

62-
These options inherit from the :doc:`date</reference/forms/types/form>` type:
63-
6462
.. include:: /reference/forms/types/options/mapped.rst.inc

reference/forms/types/percent.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This field adds a percentage sign "``%``" after the input box.
2727
| | - `invalid_message_parameters`_ |
2828
| | - `mapped`_ |
2929
+-------------+-----------------------------------------------------------------------+
30-
| Parent type | :doc:`field</reference/forms/types/field>` |
30+
| Parent type | :doc:`field</reference/forms/types/form>` |
3131
+-------------+-----------------------------------------------------------------------+
3232
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\PercentType` |
3333
+-------------+-----------------------------------------------------------------------+
@@ -66,7 +66,7 @@ places, use this option.
6666
Inherited Options
6767
-----------------
6868

69-
These options inherit from the :doc:`field</reference/forms/types/field>` type:
69+
These options inherit from the :doc:`field</reference/forms/types/form>` type:
7070

7171
.. include:: /reference/forms/types/options/required.rst.inc
7272

@@ -82,6 +82,4 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
8282

8383
.. include:: /reference/forms/types/options/invalid_message_parameters.rst.inc
8484

85-
These options inherit from the :doc:`date</reference/forms/types/form>` type:
86-
8785
.. include:: /reference/forms/types/options/mapped.rst.inc

reference/forms/types/radio.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ If you want to have a Boolean field, use :doc:`checkbox</reference/forms/types/c
2424
| | - `error_bubbling`_ |
2525
| | - `mapped`_ |
2626
+-------------+---------------------------------------------------------------------+
27-
| Parent type | :doc:`field</reference/forms/types/field>` |
27+
| Parent type | :doc:`field</reference/forms/types/form>` |
2828
+-------------+---------------------------------------------------------------------+
2929
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\RadioType` |
3030
+-------------+---------------------------------------------------------------------+
@@ -43,7 +43,7 @@ not affect the value that's set on your object.
4343
Inherited Options
4444
-----------------
4545

46-
These options inherit from the :doc:`field</reference/forms/types/field>` type:
46+
These options inherit from the :doc:`field</reference/forms/types/form>` type:
4747

4848
.. include:: /reference/forms/types/options/required.rst.inc
4949

@@ -55,6 +55,4 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
5555

5656
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
5757

58-
These options inherit from the :doc:`date</reference/forms/types/form>` type:
59-
6058
.. include:: /reference/forms/types/options/mapped.rst.inc

reference/forms/types/search.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Read about the input search field at `DiveIntoHTML5.info`_
2929
Inherited Options
3030
-----------------
3131

32-
These options inherit from the :doc:`field</reference/forms/types/field>` type:
32+
These options inherit from the :doc:`field</reference/forms/types/form>` type:
3333

3434
.. include:: /reference/forms/types/options/max_length.rst.inc
3535

@@ -45,8 +45,6 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
4545

4646
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
4747

48-
These options inherit from the :doc:`date</reference/forms/types/form>` type:
49-
5048
.. include:: /reference/forms/types/options/mapped.rst.inc
5149

5250
.. _`DiveIntoHTML5.info`: http://diveintohtml5.info/forms.html#type-search

reference/forms/types/text.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The text field represents the most basic input text field.
1818
| | - `error_bubbling`_ |
1919
| | - `mapped`_ |
2020
+-------------+--------------------------------------------------------------------+
21-
| Parent type | :doc:`field</reference/forms/types/field>` |
21+
| Parent type | :doc:`field</reference/forms/types/form>` |
2222
+-------------+--------------------------------------------------------------------+
2323
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\TextType` |
2424
+-------------+--------------------------------------------------------------------+
@@ -27,7 +27,7 @@ The text field represents the most basic input text field.
2727
Inherited Options
2828
-----------------
2929

30-
These options inherit from the :doc:`field</reference/forms/types/field>` type:
30+
These options inherit from the :doc:`field</reference/forms/types/form>` type:
3131

3232
.. include:: /reference/forms/types/options/max_length.rst.inc
3333

@@ -43,6 +43,4 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
4343

4444
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
4545

46-
These options inherit from the :doc:`date</reference/forms/types/form>` type:
47-
4846
.. include:: /reference/forms/types/options/mapped.rst.inc

reference/forms/types/textarea.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ Renders a ``textarea`` HTML element.
1818
| | - `error_bubbling`_ |
1919
| | - `mapped`_ |
2020
+-------------+------------------------------------------------------------------------+
21-
| Parent type | :doc:`field</reference/forms/types/field>` |
21+
| Parent type | :doc:`field</reference/forms/types/form>` |
2222
+-------------+------------------------------------------------------------------------+
2323
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\TextareaType` |
2424
+-------------+------------------------------------------------------------------------+
2525

2626
Inherited Options
2727
-----------------
2828

29-
These options inherit from the :doc:`field</reference/forms/types/field>` type:
29+
These options inherit from the :doc:`field</reference/forms/types/form>` type:
3030

3131
.. include:: /reference/forms/types/options/max_length.rst.inc
3232

@@ -42,6 +42,4 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
4242

4343
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
4444

45-
These options inherit from the :doc:`date</reference/forms/types/form>` type:
46-
4745
.. include:: /reference/forms/types/options/mapped.rst.inc

reference/forms/types/time.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ error_bubbling
133133
Inherited options
134134
-----------------
135135

136-
These options inherit from the :doc:`field</reference/forms/types/field>` type:
136+
These options inherit from the :doc:`field</reference/forms/types/form>` type:
137137

138138
.. include:: /reference/forms/types/options/invalid_message.rst.inc
139139

@@ -143,8 +143,6 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
143143

144144
.. include:: /reference/forms/types/options/disabled.rst.inc
145145

146-
These options inherit from the :doc:`date</reference/forms/types/form>` type:
147-
148146
.. include:: /reference/forms/types/options/mapped.rst.inc
149147

150148
.. include:: /reference/forms/types/options/virtual.rst.inc

0 commit comments

Comments
 (0)