Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8e6e550

Browse files
committed
Merge branch '2.4'
Conflicts:book/routing.rstbook/templating.rstcomponents/console/helpers/dialoghelper.rstcomponents/console/helpers/progresshelper.rstcomponents/finder.rstcomponents/http_foundation/introduction.rstcomponents/routing/hostname_pattern.rstcomponents/routing/introduction.rstcookbook/form/dynamic_form_modification.rstcookbook/templating/namespaced_paths.rstreference/configuration/framework.rstreference/configuration/security.rst
2 parents72d40a8 +a849123 commit8e6e550

File tree

21 files changed

+28
-29
lines changed

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 wasadded in Symfony 2.3. Before that, you had
133+
Support for submit buttons wasintroduced 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 wasadded in Symfony 2.3.
281+
Support for buttons in forms wasintroduced 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 wasadded in Symfony 2.3.
481+
The ability to set ``validation_groups`` to false wasintroduced 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 wasadded in Symfony 2.3.
551+
Support for buttons in forms wasintroduced 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 wasadded in Symfony 2.3.
201+
Multiselect support wasintroduced 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 wasadded in Symfony 2.3.
8+
The ``setCurrent`` method wasintroduced 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 wasadded in Symfony 2.3.
8+
The ``table`` helper wasintroduced 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 wasadded in Symfony 2.3.
98+
method wasintroduced 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 wasadded in Symfony 2.3.
70+
The ``handleRequest()`` method wasintroduced 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 wasadded in Symfony 2.3.
117+
The ``signal`` parameter of the ``stop`` method wasintroduced 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 wasadded in Symfony 2.3.
157+
method wasintroduced 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 wasadded in Symfony 2.3.
238+
The ``signal`` method wasintroduced 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 wasadded in Symfony 2.3.
264+
The ``getPid`` method wasintroduced 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 wasadded in Symfony 2.3.
215+
The use of magic ``__call()`` method wasintroduced in Symfony 2.3.
216216

217217
..caution::
218218

‎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
~~~~~~~~~~~~~~~~~~

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp