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

Commitd8db51a

Browse files
committed
Merge branch '2.8'
2 parentsd7ae2a0 +9068bc0 commitd8db51a

File tree

10 files changed

+35
-41
lines changed

10 files changed

+35
-41
lines changed

‎components/console/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,6 @@ Learn More!
581581
*:doc:`/components/console/console_arguments`
582582

583583
.. _Packagist:https://packagist.org/packages/symfony/console
584-
.. _ConEmu:https://code.google.com/p/conemu-maximus5/
584+
.. _ConEmu:https://conemu.github.io/
585585
.. _ANSICON:https://github.com/adoxa/ansicon/releases
586586
.. _Mintty:https://mintty.github.io/

‎components/http_foundation/introduction.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ can be accessed via several public properties:
6969

7070
* ``server``: equivalent of ``$_SERVER``;
7171

72-
* ``headers``: mostly equivalent to asub-set of ``$_SERVER``
72+
* ``headers``: mostly equivalent to asubset of ``$_SERVER``
7373
(``$request->headers->get('User-Agent')``).
7474

7575
Each property is a:class:`Symfony\\Component\\HttpFoundation\\ParameterBag`
@@ -90,7 +90,7 @@ instance (or a sub-class of), which is a data holder class:
9090
* ``headers``::class:`Symfony\\Component\\HttpFoundation\\HeaderBag`.
9191

9292
All:class:`Symfony\\Component\\HttpFoundation\\ParameterBag` instances have
93-
methods to retrieve and updateits data:
93+
methods to retrieve and updatetheir data:
9494

9595
:method:`Symfony\\Component\\HttpFoundation\\ParameterBag::all`
9696
Returns the parameters.
@@ -157,16 +157,16 @@ sometimes, you might want to get the value for the "original" parameter name:
157157
:method:`Symfony\\Component\\HttpFoundation\\Request::get` via the third
158158
argument::
159159

160-
// the query string is '?foo[bar]=bar'
160+
// the query string is '?foo[bar]=bar'
161161

162-
$request->query->get('foo');
163-
// returns array('bar' => 'bar')
162+
$request->query->get('foo');
163+
// returns array('bar' => 'bar')
164164

165-
$request->query->get('foo[bar]');
166-
// returns null
165+
$request->query->get('foo[bar]');
166+
// returns null
167167

168-
$request->query->get('foo[bar]', null, true);
169-
// returns 'bar'
168+
$request->query->get('foo[bar]', null, true);
169+
// returns 'bar'
170170

171171
.. _component-foundation-attributes:
172172

@@ -255,8 +255,8 @@ by using the following methods:
255255
:method:`Symfony\\Component\\HttpFoundation\\Request::getEncodings`
256256
Returns the list of accepted encodings ordered by descending quality.
257257

258-
..versionadded::2.4
259-
The ``getEncodings()`` method was introduced in Symfony 2.4.
258+
..versionadded::2.4
259+
The ``getEncodings()`` method was introduced in Symfony 2.4.
260260

261261
If you need to get full access to parsed data from ``Accept``, ``Accept-Language``,
262262
``Accept-Charset`` or ``Accept-Encoding``, you can use
@@ -515,7 +515,7 @@ You can still set the ``Content-Type`` of the sent file, or change its ``Content
515515
..versionadded::2.6
516516
The ``deleteFileAfterSend()`` method was introduced in Symfony 2.6.
517517

518-
It is possible to delete the file after the request is sent with the
518+
It is possible to delete the file after the request is sent with the
519519
:method:`Symfony\\Component\\HttpFoundation\\BinaryFileResponse::deleteFileAfterSend` method.
520520
Please note that this will not work when the ``X-Sendfile`` header is set.
521521

‎components/process.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@ The :class:`Symfony\\Component\\Process\\Process` class allows you to execute
2424
a command in a sub-process::
2525

2626
use Symfony\Component\Process\Process;
27+
use Symfony\Component\Process\Exception\ProcessFailedException;
2728

2829
$process = new Process('ls -lsa');
2930
$process->run();
3031

3132
// executes after the command finishes
3233
if (!$process->isSuccessful()) {
33-
throw new\RuntimeException($process->getErrorOutput());
34+
throw newProcessFailedException($process);
3435
}
3536

3637
echo $process->getOutput();

‎cookbook/controller/error_pages.rst

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -142,24 +142,16 @@ is undefined. The solution is to add the following check before using this funct
142142
{# ... #}
143143
{% endif %}
144144
145+
.. _testing-error-pages:
146+
145147
Testing Error Pages during Development
146148
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
147149

148150
While you're in the development environment, Symfony shows the big *exception*
149151
page instead of your shiny new customized error page. So, how can you see
150152
what it looks like and debug it?
151153

152-
The recommended solution is to use a third-party bundle called `WebfactoryExceptionsBundle`_.
153-
This bundle provides a special test controller that allows you to easily display
154-
custom error pages for arbitrary HTTP status codes even when ``kernel.debug`` is
155-
set to ``true``.
156-
157-
.. _testing-error-pages:
158-
159-
Testing Error Pages during Development
160-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
161-
162-
The default ``ExceptionController`` also allows you to preview your
154+
Fortunately, the default ``ExceptionController`` allows you to preview your
163155
*error* pages during development.
164156

165157
..versionadded::2.6

‎cookbook/event_dispatcher/event_listener.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,10 @@ or a "sub request"::
248248
Certain things, like checking information on the *real* request, may not need to
249249
be done on the sub-request listeners.
250250

251-
Events or Subscribers
252-
---------------------
251+
.. _events-or-subscribers:
252+
253+
Listeners or Subscribers
254+
------------------------
253255

254256
Listeners and subscribers can be used in the same application indistinctly. The
255257
decision to use either of them is usually a matter of personal taste. However,

‎cookbook/psr7.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ Installation
1313

1414
You can install the component in 2 different ways:
1515

16-
*:doc:`Install it via Composer</components/using_components>` (``symfony/psr-http-message-bridge`` on`Packagist`_);
16+
*:doc:`Install it via Composer</components/using_components>` (`symfony/psr-http-message-bridge on Packagist<https://packagist.org/packages/symfony/psr-http-message-bridge>`_);
1717
* Use the official Git repository (https://github.com/symfony/psr-http-message-bridge).
1818

1919
The bridge also needs a PSR-7 implementation to allow converting HttpFoundation
2020
objects to PSR-7 objects. It provides native support for `Zend Diactoros`_.
21-
Use Composer (``zendframework/zend-diactoros`` on`Packagist`_) or refer to
22-
the project documentation to install it.
21+
Use Composer (`zendframework/zend-diactoros on Packagist<https://packagist.org/packages/zendframework/zend-diactoros>`_)
22+
or refer tothe project documentation to install it.
2323

2424
Usage
2525
-----
@@ -85,5 +85,4 @@ to a :class:`Symfony\\Component\\HttpFoundation\\Response` instance::
8585
$symfonyResponse = $httpFoundationFactory->createResponse($psrResponse);
8686

8787
.. _`PSR-7`:http://www.php-fig.org/psr/psr-7/
88-
.. _Packagist:https://packagist.org/packages/symfony/psr-http-message-bridge
8988
.. _`Zend Diactoros`:https://github.com/zendframework/zend-diactoros

‎cookbook/routing/custom_route_loader.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ A custom route loader does not enable your bundle to inject routes
1616
without the need to modify the routing configuration
1717
(e.g. ``app/config/routing.yml``) manually.
1818
If your bundle provides routes, whether via a configuration file, like
19-
the `WebProfilerBundle` does, or via a custom route loader, like the
19+
the `WebProfilerBundle` does, or via a custom route loader, like the
2020
`FOSRestBundle`_ does, an entry in the routing configuration is always
2121
necessary.
2222

@@ -46,7 +46,7 @@ Take these lines from the ``routing.yml`` in the Symfony Standard Edition:
4646
4747
# app/config/routing.yml
4848
app:
49-
resource:@AppBundle/Controller/
49+
resource:"@AppBundle/Controller/"
5050
type:annotation
5151
5252
When the main loader parses this, it tries all registered delegate loaders and calls

‎cookbook/web_server/built_in.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ can change the socket passing an IP address and a port as a command-line argumen
3737

3838
..code-block::bash
3939
40-
$ php app/console server:run 192.168.0.1:8080
40+
$ php app/console server:start 192.168.0.1:8080
4141
4242
..note::
4343

‎reference/configuration/twig.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ TwigBundle Configuration ("twig")
4343
4444
# The following were added in Symfony 2.3.
4545
# See http://twig.sensiolabs.org/doc/recipes.html#using-the-template-name-to-set-the-default-escaping-strategy
46-
autoescape_service: ~# Example: @my_service
46+
autoescape_service: ~# Example:"@my_service"
4747
autoescape_service_method: ~# use in combination with autoescape_service option
4848
base_template_class: ~# Example: Twig_Template
4949
cache:"%kernel.cache_dir%/twig"

‎reference/forms/types/collection.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,9 @@ the empty values will be kept.
276276
entry_options
277277
~~~~~~~~~~~~~
278278

279-
..versionadded::2.7
280-
The ``entry_options`` option was introduced in Symfony 2.7 in favor of
281-
``options``, which is available prior to 2.7.
279+
..versionadded::2.8
280+
The ``entry_options`` option was introduced in Symfony 2.8 in favor of
281+
``options``, which is available prior to 2.8.
282282

283283
**type**: ``array`` **default**: ``array()``
284284

@@ -303,9 +303,9 @@ type::
303303
entry_type
304304
~~~~~~~~~~
305305

306-
..versionadded::2.7
307-
The ``entry_type`` option was introduced in Symfony 2.7 in favor of
308-
``type``, which is available prior to 2.7.
306+
..versionadded::2.8
307+
The ``entry_type`` option was introduced in Symfony 2.8 in favor of
308+
``type``, which is available prior to 2.8.
309309

310310
**type**: ``string`` or:class:`Symfony\\Component\\Form\\FormTypeInterface` **required**
311311

0 commit comments

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