8000 Merge branch '2.4' · symfony/symfony-docs@8e6e550 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8e6e550

Browse files
weaverryanweaverryan
committed
Merge branch '2.4'
Conflicts: book/routing.rst book/templating.rst components/console/helpers/dialoghelper.rst components/console/helpers/progresshelper.rst components/finder.rst components/http_foundation/introduction.rst components/routing/hostname_pattern.rst components/routing/introduction.rst cookbook/form/dynamic_form_modification.rst cookbook/templating/namespaced_paths.rst reference/configuration/framework.rst reference/configuration/security.rst
2 parents 72d40a8 + a849123 commit 8e6e550

21 files changed

+28
-29
lines changed

‎book/forms.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ other things, determines which HTML form tag(s) is rendered for that field.
130130
Finally, you added a submit button for submitting the form to the server.
131131

132132
.. versionadded:: 2.3
133-
Support for submit buttons was added in Symfony 2.3. Before that, you had
133+
Support for submit buttons was introduced in Symfony 2.3. Before that, you had
134134
to add buttons to the form's HTML manually.
135135

136136
Symfony2 comes with many built-in types that will be discussed shortly
@@ -278,7 +278,7 @@ Submitting Forms with Multiple Buttons
278278
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
279279

280280
.. versionadded:: 2.3
281-
Support for buttons in forms was added in Symfony 2.3.
281+
Support for buttons in forms was introduced in Symfony 2.3.
282282

283283
When your form contains more than one submit button, you will want to check
284284
which of the buttons was clicked to adapt the program flow in your controller.
@@ -478,7 +478,7 @@ Disabling Validation
478478
~~~~~~~~~~~~~~~~~~~~
479479

480480
.. versionadded:: 2.3
481-
The ability to set ``validation_groups`` to false was added in Symfony 2.3.
481+
The ability to set ``validation_groups`` to false was introduced in Symfony 2.3.
482482

483483
Sometimes it is useful to suppress the validation of a form altogether. For
484484
these cases you can set the ``validation_groups`` option to ``false``::
@@ -548,7 +548,7 @@ Groups based on the Clicked Button
548548
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
549549

550550
.. versionadded:: 2.3
551-
Support for buttons in forms was added in Symfony 2.3.
551+
Support for buttons in forms was introduced in Symfony 2.3.
552552

553553
When your form contains multiple submit buttons, you can change the validation
554554
group depending on which button is used to submit the form. For example,

‎components/console/helpers/dialoghelper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ argument). The default value for the attempts is ``false``, which means infinite
198198
attempts. You can define your own error message in the sixth argument.
199199

200200
.. versionadded:: 2.3
201-
Multiselect support was added in Symfony 2.3.
201+
Multiselect support was introduced in Symfony 2.3.
202202

203203
Multiple Choices
204204
................

‎components/console/helpers/progresshelper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Progress Helper
55
===============
66

77
.. versionadded:: 2.3
8-
The ``setCurrent`` method was added in Symfony 2.3.
8+
The ``setCurrent`` method was introduced in Symfony 2.3.
99

1010
.. versionadded:: 2.4
1111
The ``clear`` method was added in Symfony 2.4.

‎components/console/helpers/tablehelper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Table Helper
55
============
66

77
.. versionadded:: 2.3
8-
The ``table`` helper was added in Symfony 2.3.
8+
The ``table`` helper was introduced in Symfony 2.3.
99

1010
.. caution::
1111

‎components/finder.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Exclude directories from matching with the
9595

9696
.. versionadded:: 2.3
9797
The :method:`Symfony\\Component\\Finder\\Finder::ignoreUnreadableDirs`
98-
method was added in Symfony 2.3.
98+
method was introduced in Symfony 2.3.
9999

100100
It's also possible to ignore directories that you don't have permission to read::
101101

‎components/form/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Request Handling
6767
~~~~~~~~~~~~~~~~
6868

6969
.. versionadded:: 2.3
70-
The ``handleRequest()`` method was added in Symfony 2.3.
70+
The ``handleRequest()`` method was introduced in Symfony 2.3.
7171

7272
To process form data, you'll need to call the :method:`Symfony\\Component\\Form\\Form::handleRequest`
7373
method::

‎components/intl.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ The Intl Component
99
access to the localization data of the `ICU library`_.
1010

1111
.. versionadded:: 2.3
12-
13-
The Intl component was added in Symfony 2.3. In earlier versions of Symfony,
12+
The Intl component was introduced in Symfony 2.3. In earlier versions of Symfony,
1413
you should use the Locale component instead.
1514

1615
.. caution::

‎components/process.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Stopping a Process
114114
------------------
115115

116116
.. versionadded:: 2.3
117-
The ``signal`` parameter of the ``stop`` method was added in Symfony 2.3.
117+
The ``signal`` parameter of the ``stop`` method was introduced in Symfony 2.3.
118118

119119
Any asynchronous process can be stopped at any time with the
120120
:method:`Symfony\\Component\\Process\\Process::stop` method. This method takes
@@ -154,7 +154,7 @@ To make your code work better on all platforms, you might want to use the
154154

155155
.. versionadded:: 2.3
156156
The :method:`ProcessBuilder::setPrefix<Symfony\\Component\\Process\\ProcessBuilder::setPrefix>`
157-
method was added in Symfony 2.3.
157+
method was introduced in Symfony 2.3.
158158

159159
In case you are building a binary driver, you can use the
160160
:method:`Symfony\\Component\\Process\\Process::setPrefix` method to prefix all
@@ -235,7 +235,7 @@ Process Signals
235235
---------------
236236

237237
.. versionadded:: 2.3
238-
The ``signal`` method was added in Symfony 2.3.
238+
The ``signal`` method was introduced in Symfony 2.3.
239239

240240
When running a program asynchronously, you can send it posix signals with the
241241
:method:`Symfony\\Component\\Process\\Process::signal` method::
@@ -261,7 +261,7 @@ Process Pid
261261
-----------
262262

263263
.. versionadded:: 2.3
264-
The ``getPid`` method was added in Symfony 2.3.
264+
The ``getPid`` method was introduced in Symfony 2.3.
265265

266266
You can access the `pid`_ of a running process with the
267267
:method:`Symfony\\Component\\Process\\Process::getPid` method.

‎components/property_access/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ enable this feature by using :class:`Symfony\\Component\\PropertyAccess\\Propert
212212
echo $accessor->getValue($person, 'wouter'); // array(...)
213213

214214
.. versionadded:: 2.3
215-
The use of magic ``__call()`` method was added in Symfony 2.3.
215+
The use of magic ``__call()`` method was introduced in Symfony 2.3.
216216

217217
.. caution::
218218

< 1241 /div>

‎components/security/authorization.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ method::
142142

143143
$roleVoter = new RoleVoter('ROLE_');
144144

145-
$roleVoter->vote($token, $object, 'ROLE_ADMIN');
145+
$roleVoter->vote($token, $object, array('ROLE_ADMIN'));
146146

147147
RoleHierarchyVoter
148148
~~~~~~~~~~~~~~~~~~

‎components/serializer.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Ignoring Attributes when Serializing
108108

109109
.. versionadded:: 2.3
110110
The :method:`GetSetMethodNormalizer::setIgnoredAttributes<Symfony\\Component\\Serializer\\Normalizer\\GetSetMethodNormalizer::setIgnoredAttributes>`
111-
method was added in Symfony 2.3.
111+
method was introduced in Symfony 2.3.
112112

113113
As an option, there's a way to ignore attributes from the origin object when
114114
serializing. To remove those attributes use the
@@ -153,7 +153,7 @@ Using Camelized Method Names for Underscored Attributes
153153

154154
.. versionadded:: 2.3
155155
The :method:`GetSetMethodNormalizer::setCamelizedAttributes<Symfony\\Component\\Serializer\\Normalizer\\GetSetMethodNormalizer::setCamelizedAttributes>`
156-
method was added in Symfony 2.3.
156+
method was introduced in Symfony 2.3.
157157

158158
Sometimes property names from the serialized content are underscored (e.g.
159159
``first_name``). Normally, these attributes will use get/set methods like

‎cookbook/doctrine/mapping_model_classes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ register the mappings for your model classes.
1717
just to get the auto mapping, use the compiler pass.
1818

1919
.. versionadded:: 2.3
20-
The base mapping compiler pass was added in Symfony 2.3. The Doctrine bundles
20+
The base mapping compiler pass was introduced in Symfony 2.3. The Doctrine bundles
2121
support it from DoctrineBundle >= 1.2.1, MongoDBBundle >= 3.0.0,
2222
PHPCRBundle >= 1.0.0-alpha2 and the (unversioned) CouchDBBundle supports the
2323
compiler pass since the `CouchDB Mapping Compiler Pass pull request`_

‎cookbook/form/direct_submit.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ How to use the submit() Function to handle Form Submissions
66

77
.. versionadded:: 2.3
88
The :method:`Symfony\\Component\\Form\\FormInterface::handleRequest`
9-
method was added in Symfony 2.3.
9+
method was introduced in Symfony 2.3.
1010

1111
With the ``handleRequest()`` method, it is really easy to handle form
1212
submissions::

‎cookbook/security/entity_provider.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -800,4 +800,4 @@ or worry about it.
800800

801801
.. versionadded:: 2.1
802802
In Symfony 2.1, the ``equals`` method was removed from ``UserInterface``
803-
and the ``EquatableInterface`` was added in its place.
803+
and the ``EquatableInterface`` was introduced in its place.

‎cookbook/session/php_bridge.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Bridge a legacy application with Symfony Sessions
55
=================================================
66

77
.. versionadded:: 2.3
8-
The ability to integrate with a legacy PHP session was added in Symfony 2.3.
8+
The ability to integrate with a legacy PHP session was introduced in Symfony 2.3.
99

1010
If you're integrating the Symfony full-stack Framework into a legacy application
1111
that starts the session with ``session_start()``, you may still be able to

‎reference/constraints/Iban.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Iban
22
====
33

44
.. versionadded:: 2.3
5-
The Iban constraint was added in Symfony 2.3.
5+
The Iban constraint was introduced in Symfony 2.3.
66

77
This constraint is used to ensure that a bank account number has the proper format of
88
an `International Bank Account Number (IBAN)`_. IBAN is an internationally agreed means

‎reference/constraints/Isbn.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Isbn
22
====
33

44
.. versionadded:: 2.3
5-
The Isbn constraint was added in Symfony 2.3.
5+
The Isbn constraint was introduced in Symfony 2.3.
66

77
This constraint validates that an `International Standard Book Number (ISBN)`_
88
is either a valid ISBN-10, a valid ISBN-13 or both.

‎reference/constraints/Issn.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Issn
22
====
33

44
.. versionadded:: 2.3
5-
The Issn constraint was added in Symfony 2.3.
5+
The Issn constraint was introduced in Symfony 2.3.
66

77
Validates that a value is a valid `International Standard Serial Number (ISSN)`_.
88

‎reference/forms/types/button.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ button Field Type
55
=================
66

77
.. versionadded:: 2.3
8-
The ``button`` type was added in Symfony 2.3
8+
The ``button`` type was introduced in Symfony 2.3
99

1010
A simple, non-responsive button.
1111

‎reference/forms/types/reset.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ reset Field Type
55
================
66

77
.. versionadded:: 2.3
8-
The ``reset`` type was added in Symfony 2.3
8+
The ``reset`` type was introduced in Symfony 2.3
99

1010
A button that resets all fields to their original values.
1111

‎reference/forms/types/submit.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ submit Field Type
55
=================
66

77
.. versionadded:: 2.3
8-
The ``submit`` type was added in Symfony 2.3
8+
The ``submit`` type was introduced in Symfony 2.3
99

1010
A submit button.
1111

0 commit comments

Comments
 (0)
0