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

0 commit comments

Comments
 (0)