Skip to content

Commit b675661

Browse files
weaverryanweaverryan
committed
Merge branch '2.2' into 2.3
Conflicts: reference/forms/types/form.rst
2 parents 006ae65 + 4848f40 commit b675661

31 files changed

+53
-43
lines changed

‎cookbook/cache/varnish.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ absolute URLs:
196196
if (req.http.X-Forwarded-Proto == "https" ) {
197197
set req.http.X-Forwarded-Port = "443";
198198
} else {
199-
set req.http.X-Forwarded-Port = "80"
199+
set req.http.X-Forwarded-Port = "80";
200200
}
201201
}
202202

‎cookbook/form/unit_testing.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ on other extensions. You need add those extensions to the factory object::
176176
parent::setUp();
177177

178178
$this->factory = Forms::createFormFactoryBuilder()
179+
->addExtensions($this->getExtensions())
179180
->addTypeExtension(
180181
new FormTypeValidatorExtension(
181182
$this->getMock('Symfony\Component\Validator\ValidatorInterface')

‎reference/forms/types/birthday.rst

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

7575
.. include:: /reference/forms/types/options/view_timezone.rst.inc
7676

77-
These options inherit from the :doc:`date </reference/forms/types/form>` type:
77+
These options inherit from the :doc:`form </reference/forms/types/form>` type:
7878

7979
.. include:: /reference/forms/types/options/invalid_message.rst.inc
8080

‎reference/forms/types/checkbox.rst

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

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

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

‎reference/forms/types/choice.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ option.
3131
| | - `by_reference`_ |
3232
| | - `empty_data`_ |
3333
+-------------+------------------------------------------------------------------------------+
34-
| Parent type | :doc:`form </reference/forms/types/form>` (if expanded), ``field`` otherwise |
34+
| Parent type | :doc:`form </reference/forms/types/form>` |
3535
+-------------+------------------------------------------------------------------------------+
3636
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\ChoiceType` |
3737
+-------------+------------------------------------------------------------------------------+
@@ -110,7 +110,7 @@ can be created to supply the choices.
110110
Inherited options
111111
-----------------
112112

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

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

‎reference/forms/types/collection.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ replaced with the same value.
336336
Inherited options
337337
-----------------
338338

339-
These options inherit from the :doc:`field </reference/forms/types/form>` type.
339+
These options inherit from the :doc:`form </reference/forms/types/form>` type.
340340
Not all options are listed here - only the most applicable to this type:
341341

342342
.. include:: /reference/forms/types/options/label.rst.inc

‎reference/forms/types/country.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ These options inherit from the :doc:`choice </reference/forms/types/choice>` typ
7070

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

73-
These options inherit from the :doc:`date </reference/forms/types/form>` type:
73+
These options inherit from the :doc:`form </reference/forms/types/form>` type:
7474

7575
.. include:: /reference/forms/types/options/required.rst.inc
7676

‎reference/forms/types/date.rst

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

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

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

@@ -151,5 +151,3 @@ These options inherit from the :doc:`field </reference/forms/types/form>` type:
151151
.. include:: /reference/forms/types/options/inherit_data.rst.inc
152152

153153
.. include:: /reference/forms/types/options/error_mapping.rst.inc
154-
155-
.. _`RFC 3339`: http://tools.ietf.org/html/rfc3339

‎reference/forms/types/datetime.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ for more details.
109109
Inherited options
110110
-----------------
111111

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

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

‎reference/forms/types/email.rst

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

2828
Inherited Options
2929
-----------------
3030

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

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

‎reference/forms/types/entity.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ These options inherit from the :doc:`choice </reference/forms/types/choice>` typ
162162

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

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

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

‎reference/forms/types/file.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ how to manage a file upload associated with a Doctrine entity.
7979
Inherited options
8080
-----------------
8181

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

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

‎reference/forms/types/form.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ on all fields.
3131

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

34+
.. include:: /reference/forms/types/options/block_name.rst.inc
35+
3436
inherit_data
3537
------------
3638

‎reference/forms/types/hidden.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The hidden type represents a hidden input field.
1717
| | - `mapped`_ |
1818
| | - `error_mapping`_ |
1919
+-------------+----------------------------------------------------------------------+
20-
| Parent type | :doc:`field </reference/forms/types/form>` |
20+
| Parent type | :doc:`form </reference/forms/types/form>` |
2121
+-------------+----------------------------------------------------------------------+
2222
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\HiddenType` |
2323
+-------------+----------------------------------------------------------------------+
@@ -42,7 +42,7 @@ Pass errors to the root form, otherwise they will not be visible.
4242
Inherited Options
4343
-----------------
4444

45-
These options inherit from the :doc:`date </reference/forms/types/form>` type:
45+
These options inherit from the :doc:`form </reference/forms/types/form>` type:
4646

4747
.. include:: /reference/forms/types/options/data.rst.inc
4848

‎reference/forms/types/integer.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ integers. By default, all non-integer values (e.g. 6.78) will round down (e.g. 6
2929
| | - `invalid_message_parameters`_ |
3030
| | - `mapped`_ |
3131
+-------------+-----------------------------------------------------------------------+
32-
| Parent type | :doc:`field </reference/forms/types/form>` |
32+
| Parent type | :doc:`form </reference/forms/types/form>` |
3333
+-------------+-----------------------------------------------------------------------+
3434
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\IntegerType` |
3535
+-------------+-----------------------------------------------------------------------+
@@ -65,7 +65,7 @@ on the :class:`Symfony\\Component\\Form\\Extension\\Core\\DataTransformer\\Integ
6565
Inherited options
6666
-----------------
6767

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

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

‎reference/forms/types/language.rst

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

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

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

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

‎reference/forms/types/locale.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ These options inherit from the :doc:`choice </reference/forms/types/choice>` typ
7373

7474
.. include:: /reference/forms/types/options/error_mapping.rst.inc
7575

76-
These options inherit from the :doc:`date </reference/forms/types/form>` type:
76+
These options inherit from the :doc:`form </reference/forms/types/form>` type:
7777

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

‎reference/forms/types/money.rst

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

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

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

‎reference/forms/types/number.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ you want to use for your number.
2525
| | - `invalid_message_parameters`_ |
2626
| | - `mapped`_ |
2727
+-------------+----------------------------------------------------------------------+
28-
| Parent type | :doc:`field </reference/forms/types/form>` |
28+
| Parent type | :doc:`form </reference/forms/types/form>` |
2929
+-------------+----------------------------------------------------------------------+
3030
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\NumberType` |
3131
+-------------+----------------------------------------------------------------------+
@@ -73,7 +73,7 @@ option is a constant on the :class:`Symfony\\Component\\Form\\Extension\\Core\\D
7373
Inherited Options
7474
-----------------
7575

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

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

‎reference/forms/types/options/block_name.rst.inc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
block_name
2+
~~~~~~~~~~~
3+
4+
**type**: ``string`` **default**: the form's name (see :ref:`Knowing which block to customize <cookbook-form-customization-sidebar>`)
5+
6+
Allows you to override the block name used to render the form type.
7+
Useful for example if you have multiple instances of the same form and you
8+
need to personalize the rendering of the forms individually.

‎reference/forms/types/options/date_format.rst.inc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ For more information on valid formats, see `Date/Time Format Syntax`_::
2020

2121
.. note::
2222

23-
If you want your field to be rendered as an HTML5 "date" field, you have
23+
If you want your field to be rendered as an HTML5 "date" field, you have to
2424
use a ``single_text`` widget with the ``yyyy-MM-dd`` format (the `RFC 3339`_
2525
format) which is the default value if you use the ``single_text`` widget.
2626

2727
.. _`Date/Time Format Syntax`: http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax
28-
.. _`IntlDateFormatter::MEDIUM`: http://www.php.net/manual/en/class.intldateformatter.php#intl.intldateformatter-constants
28+
.. _`IntlDateFormatter::MEDIUM`: http://www.php.net/manual/en/class.intldateformatter.php#intl.intldateformatter-constants
29+
.. _`RFC 3339`: http://tools.ietf.org/html/rfc3339

‎reference/forms/types/password.rst

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

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

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

‎reference/forms/types/percent.rst

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

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

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

‎reference/forms/types/radio.rst

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

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

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

‎reference/forms/types/repeated.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ accuracy.
2727
| | - `mapped`_ |
2828
| | - `error_mapping`_ |
2929
+-------------+------------------------------------------------------------------------+
30-
| Parent type | :doc:`field </reference/forms/types/form>` |
30+
| Parent type | :doc:`form </reference/forms/types/form>` |
3131
+-------------+------------------------------------------------------------------------+
3232
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\RepeatedType` |
3333
+-------------+------------------------------------------------------------------------+
@@ -180,7 +180,7 @@ error_bubbling
180180
Inherited options
181181
-----------------
182182

183-
These options inherit from the :doc:`date </reference/forms/types/form>` type:
183+
These options inherit from the :doc:`form </reference/forms/types/form>` type:
184184

185185
.. include:: /reference/forms/types/options/invalid_message.rst.inc
186186

‎reference/forms/types/search.rst

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

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

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

‎reference/forms/types/text.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The text field represents the most basic input text field.
1919
| | - `error_mapping`_ |
2020
| | - `mapped`_ |
2121
+-------------+--------------------------------------------------------------------+
22-
| Parent type | :doc:`field </reference/forms/types/form>` |
22+
| Parent type | :doc:`form </reference/forms/types/form>` |
2323
+-------------+--------------------------------------------------------------------+
2424
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\TextType` |
2525
+-------------+--------------------------------------------------------------------+
@@ -28,7 +28,7 @@ The text field represents the most basic input text field.
2828
Inherited Options
2929
-----------------
3030

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

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

‎reference/forms/types/textarea.rst

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

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

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

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

‎reference/forms/types/time.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ error_bubbling
137137
Inherited options
138138
-----------------
139139

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

142142
.. include:: /reference/forms/types/options/invalid_message.rst.inc
143143

‎reference/forms/types/timezone.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ These options inherit from the :doc:`choice </reference/forms/types/choice>` typ
6262

6363
.. include:: /reference/forms/types/options/empty_value.rst.inc
6464

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

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

0 commit comments

Comments
 (0)