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

Commitc703549

Browse files
committed
Merge branch '2.4'
2 parents8e6e550 +499eb6c commitc703549

File tree

30 files changed

+40
-40
lines changed

30 files changed

+40
-40
lines changed

‎book/controller.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ itself.
398398
via the ``container`` property.
399399

400400
..versionadded::2.4
401-
The ``ContainerAwareTrait``is new in Symfony 2.4.
401+
The ``ContainerAwareTrait``was introduced in Symfony 2.4.
402402

403403
..note::
404404

@@ -766,7 +766,7 @@ headers and content that's sent back to the client::
766766
$response->headers->set('Content-Type', 'application/json');
767767

768768
..versionadded::2.4
769-
Support for HTTP status code constants wasadded in Symfony 2.4.
769+
Support for HTTP status code constants wasintroduced in Symfony 2.4.
770770

771771
..tip::
772772

‎book/from_flat_php_to_symfony2.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ the HTTP response being returned. Use them to improve the blog:
481481
$response->send();
482482

483483
..versionadded::2.4
484-
Support for HTTP status code constants wasadded in Symfony 2.4.
484+
Support for HTTP status code constants wasintroduced in Symfony 2.4.
485485

486486
The controllers are now responsible for returning a ``Response`` object.
487487
To make this easier, you can add a new ``render_template()`` function, which,

‎book/http_cache.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ Here is how you can configure the Symfony2 reverse proxy to support the
10821082
}
10831083

10841084
..versionadded::2.4
1085-
Support for HTTP status code constants wasadded in Symfony 2.4.
1085+
Support for HTTP status code constants wasintroduced in Symfony 2.4.
10861086

10871087
..caution::
10881088

‎book/http_fundamentals.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ interface to construct the response that needs to be returned to the client::
285285
$response->send();
286286

287287
..versionadded::2.4
288-
Support for HTTP status code constants wasadded in Symfony 2.4.
288+
Support for HTTP status code constants wasintroduced in Symfony 2.4.
289289

290290
If Symfony offered nothing else, you would already have a toolkit for easily
291291
accessing request information and an object-oriented interface for creating

‎book/internals.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ and set a new ``Exception`` object, or do nothing::
427427
);
428428

429429
..versionadded::2.4
430-
Support for HTTP status code constants wasadded in Symfony 2.4.
430+
Support for HTTP status code constants wasintroduced in Symfony 2.4.
431431

432432
..seealso::
433433

‎book/service_container.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ Injecting the Request
836836
~~~~~~~~~~~~~~~~~~~~~
837837

838838
..versionadded::2.4
839-
The ``request_stack`` service was introduced inversion 2.4.
839+
The ``request_stack`` service was introduced inSymfony 2.4.
840840

841841
As of Symfony 2.4, instead of injecting the ``request`` service, you should
842842
inject the ``request_stack`` service and access the ``Request`` by calling

‎book/testing.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ document::
311311
$this->assertTrue($client->getResponse()->isRedirect());
312312

313313
..versionadded::2.4
314-
Support for HTTP status code constants wasadded with Symfony 2.4.
314+
Support for HTTP status code constants wasintroduced in Symfony 2.4.
315315

316316
..index::
317317
single: Tests; Client

‎components/console/helpers/progresshelper.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Progress Helper
88
The ``setCurrent`` method was introduced in Symfony 2.3.
99

1010
..versionadded::2.4
11-
The ``clear`` method wasadded in Symfony 2.4.
11+
The ``clear`` method wasintroduced in Symfony 2.4.
1212

1313
..caution::
1414

‎components/console/helpers/tablehelper.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Customize Table Layout using Named Layouts
4040
------------------------------------------
4141

4242
..versionadded::2.4
43-
The ``TableHelper::LAYOUT_COMPACT`` layout wasadded in Symfony 2.4.
43+
The ``TableHelper::LAYOUT_COMPACT`` layout wasintroduced in Symfony 2.4.
4444

4545
The Table helper ships with three preconfigured table layouts:
4646

‎components/console/introduction.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ level. For example::
203203
:method:`Symfony\\Component\\Console\\Output\\Output::isVerbose`,
204204
:method:`Symfony\\Component\\Console\\Output\\Output::isVeryVerbose` and
205205
:method:`Symfony\\Component\\Console\\Output\\Output::isDebug`
206-
methods were introduced inversion 2.4
206+
methods were introduced inSymfony 2.4
207207

208208
There are also more semantic methods you can use to test for each of the
209209
verbosity levels::

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp