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

Commit a849123

Browse files
weaverryanweaverryan
committed
Merge branch '2.3' into 2.4
Conflicts: book/templating.rst components/class_loader/cache_class_loader.rst components/class_loader/class_loader.rst components/class_loader/debug_class_loader.rst components/event_dispatcher/immutable_dispatcher.rst components/process.rst reference/constraints/Regex.rst reference/constraints/UniqueEntity.rst reference/twig_reference.rst
2 parents b0e07b4 + e7580c0 commit a849123

30 files changed

+46
-47
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,

‎book/routing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ Adding a Host Requirement
721721
~~~~~~~~~~~~~~~~~~~~~~~~~
722722

723723
.. versionadded:: 2.2
724-
Host matching support was added in Symfony 2.2
724+
Host matching support was introduced in Symfony 2.2
725725

726726
You can also match on the HTTP *host* of the incoming request. For more
727727
information, see :doc:`/components/routing/hostname_pattern` in the Routing
@@ -1165,7 +1165,7 @@ Adding a Host requirement to Imported Routes
11651165
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
11661166

11671167
.. versionadded:: 2.2
1168-
Host matching support was added in Symfony 2.2
1168+
Host matching support was introduced in Symfony 2.2
11691169

11701170
You can set the host regex on imported routes. For more information, see
11711171
:ref:`component-routing-host-imported`.

‎book/templating.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ Template Naming and Locations
376376
-----------------------------
377377

378378
.. versionadded:: 2.2
379-
Namespaced path support was added in 2.2, allowing for template names
379+
Namespaced path support was introduced in 2.2, allowing for template names
380380
like ``@AcmeDemo/layout.html.twig``. See :doc:`/cookbook/templating/namespaced_paths`
381381
for more details.
382382

@@ -783,7 +783,7 @@ in your application configuration:
783783
));
784784
785785
.. versionadded:: 2.2
786-
Default templates per render function was added in Symfony 2.2
786+
Default templates per render function was introduced in Symfony 2.2
787787

788788
You can define default templates per ``render`` function (which will override
789789
any global default template that is defined):

‎components/console/helpers/dialoghelper.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Autocompletion
6060
~~~~~~~~~~~~~~
6161

6262
.. versionadded:: 2.2
63-
Autocompletion for questions was added in Symfony 2.2.
63+
Autocompletion for questions was introduced in Symfony 2.2.
6464

6565
You can also specify an array of potential answers for a given question. These
6666
will be autocompleted as the user types::
@@ -78,7 +78,7 @@ Hiding the User's Response
7878
~~~~~~~~~~~~~~~~~~~~~~~~~~
7979

8080
.. versionadded:: 2.2
81-
The ``askHiddenResponse`` method was added in Symfony 2.2.
81+
The ``askHiddenResponse`` method was introduced in Symfony 2.2.
8282

8383
You can also ask a question and hide the response. This is particularly
8484
convenient for passwords::
@@ -148,7 +148,7 @@ Validating a Hidden Response
148148
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
149149

150150
.. versionadded:: 2.2
151-
The ``askHiddenResponseAndValidate`` method was added in Symfony 2.2.
151+
The ``askHiddenResponseAndValidate`` method was introduced in Symfony 2.2.
152152

153153
You can also ask and validate a hidden response::
154154

@@ -176,7 +176,7 @@ Let the user choose from a list of Answers
176176

177177
.. versionadded:: 2.2
178178
The :method:`Symfony\\Component\\Console\\Helper\\DialogHelper::select` method
179-
was added in Symfony 2.2.
179+
was introduced in Symfony 2.2.
180180

181181
If you have a predefined set of answers the user can choose from, you
182182
could use the ``ask`` method described above or, to make sure the user
@@ -211,7 +211,7 @@ argument). The default value for the attempts is ``false``, which means infinite
211211
attempts. You can define your own error message in the sixth argument.
212212

213213
.. versionadded:: 2.3
214-
Multiselect support was added in Symfony 2.3.
214+
Multiselect support was introduced in Symfony 2.3.
215215

216216
Multiple Choices
217217
................

‎components/console/helpers/progresshelper.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Progress Helper
55
===============
66

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

1010
.. versionadded:: 2.3
11-
The ``setCurrent`` method was added in Symfony 2.3.
11+
The ``setCurrent`` method was introduced in Symfony 2.3.
1212

1313
.. versionadded:: 2.4
1414
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
When building a console application it may be useful to display tabular data:
1111

‎components/finder.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Search in several locations by chaining calls to
8383
$finder->files()->in(__DIR__)->in('/elsewhere');
8484

8585
.. versionadded:: 2.2
86-
Wildcard support was added in version 2.2.
86+
Wildcard support was introduced in version 2.2.
8787

8888
Use wildcard characters to search in the directories matching a pattern::
8989

@@ -98,7 +98,7 @@ Exclude directories from matching with the
9898

9999
.. versionadded:: 2.3
100100
The :method:`Symfony\\Component\\Finder\\Finder::ignoreUnreadableDirs`
101-
method was added in Symfony 2.3.
101+
method was introduced in Symfony 2.3.
102102

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

‎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/http_foundation/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ abstracts the hard work behind a simple API::
495495

496496
.. versionadded:: 2.2
497497
The :class:`Symfony\\Component\\HttpFoundation\\BinaryFileResponse`
498-
class was added in Symfony 2.2.
498+
class was introduced in Symfony 2.2.
499499

500500
Alternatively, if you are serving a static file, you can use a
501501
:class:`Symfony\\Component\\HttpFoundation\\BinaryFileResponse`::

‎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
@@ -117,7 +117,7 @@ Stopping a Process
117117
------------------
118118

119119
.. versionadded:: 2.3
120-
The ``signal`` parameter of the ``stop`` method was added in Symfony 2.3.
120+
The ``signal`` parameter of the ``stop`` method was introduced in Symfony 2.3.
121121

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

158158
.. versionadded:: 2.3
159159
The :method:`ProcessBuilder::setPrefix<Symfony\\Component\\Process\\ProcessBuilder::setPrefix>`
160-
method was added in Symfony 2.3.
160+
method was introduced in Symfony 2.3.
161161

162162
In case you are building a binary driver, you can use the
163163
:method:`Symfony\\Component\\Process\\Process::setPrefix` method to prefix all
@@ -238,7 +238,7 @@ Process Signals
238238
---------------
239239

240240
.. versionadded:: 2.3
241-
The ``signal`` method was added in Symfony 2.3.
241+
The ``signal`` method was introduced in Symfony 2.3.
242242

243243
When running a program asynchronously, you can send it posix signals with the
244244
:method:`Symfony\\Component\\Process\\Process::signal` method::
@@ -264,7 +264,7 @@ Process Pid
264264
-----------
265265

266266
.. versionadded:: 2.3
267-
The ``getPid`` method was added in Symfony 2.3.
267+
The ``getPid`` method was introduced in Symfony 2.3.
268268

269269
You can access the `pid`_ of a running process with the
270270
: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
@@ -216,7 +216,7 @@ enable this feature by using :class:`Symfony\\Component\\PropertyAccess\\Propert
216216
echo $accessor->getValue($person, 'wouter'); // array(...)
217217

218218
.. versionadded:: 2.3
219-
The use of magic ``__call()`` method was added in Symfony 2.3.
219+
The use of magic ``__call()`` method was introduced in Symfony 2.3.
220220

221221
.. caution::
222222

‎components/routing/hostname_pattern.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ How to match a route based on the Host
55
======================================
66

77
.. versionadded:: 2.2
8-
Host matching support was added in Symfony 2.2
8+
Host matching support was introduced in Symfony 2.2
99

1010
You can also match on the HTTP *host* of the incoming request.
1111

‎components/routing/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ A full route definition can contain up to seven parts:
9494
``GET``, ``POST``, ...).
9595

9696
.. versionadded:: 2.2
97-
Host matching support was added in Symfony 2.2
97+
Host matching support was introduced in Symfony 2.2
9898

9999
Take the following route, which combines several of these ideas::
100100

‎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/form/dynamic_form_modification.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ the event listener might look like the following::
132132
.. versionadded:: 2.2
133133
The ability to pass a string into
134134
:method:`FormInterface::add <Symfony\\Component\\Form\\FormInterface::add>`
135-
was added in Symfony 2.2.
135+
was introduced in Symfony 2.2.
136136

137137
.. note::
138138
You can of course use any callback type instead of a closure, e.g. a method

‎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

‎cookbook/templating/namespaced_paths.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ How to use and Register namespaced Twig Paths
55
=============================================
66

77
.. versionadded:: 2.2
8-
Namespaced path support was added in 2.2.
8+
Namespaced path support was introduced in 2.2.
99

1010
Usually, when you refer to a template, you'll use the ``MyBundle:Subdir:filename.html.twig``
1111
format (see :ref:`template-naming-locations`).

‎reference/configuration/framework.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ profiler
411411
~~~~~~~~
412412

413413
.. versionadded:: 2.2
414-
The ``enabled`` option was added in Symfony 2.2. Previously, the profiler
414+
The ``enabled`` option was introduced in Symfony 2.2. Previously, the profiler
415415
could only be disabled by omitting the ``framework.profiler`` configuration
416416
entirely.
417417

‎reference/configuration/security.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ Using the PBKDF2 encoder: Security and Speed
291291
--------------------------------------------
292292

293293
.. versionadded:: 2.2
294-
The PBKDF2 password encoder was added in Symfony 2.2.
294+
The PBKDF2 password encoder was introduced in Symfony 2.2.
295295

296296
The `PBKDF2`_ encoder provides a high level of Cryptographic security, as
297297
recommended by the National Institute of Standards and Technology (NIST).
@@ -316,7 +316,7 @@ Using the BCrypt Password Encoder
316316
the `ircmaxell/password-compat`_ library via Composer.
317317

318318
.. versionadded:: 2.2
319-
The BCrypt password encoder was added in Symfony 2.2.
319+
The BCrypt password encoder was introduced in Symfony 2.2.
320320

321321
.. configuration-block::
322322

‎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

0 commit comments

Comments
 (0)
0