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

Commitde9b3d5

Browse files
committed
Merge branch '2.8'
2 parentsc1cbb9a +164ce27 commitde9b3d5

File tree

9 files changed

+18
-23
lines changed

9 files changed

+18
-23
lines changed

‎book/http_cache.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ This has two very reasonable consequences:
384384

385385
* You should *never* change the state of your application when responding
386386
to a GET or HEAD request. Even if you don't use a gateway cache, the presence
387-
of proxy cachesmean that any GET or HEAD request may or may not actually
387+
of proxy cachesmeans that any GET or HEAD request may or may not actually
388388
hit your server;
389389

390390
* Don't expect PUT, POST or DELETE methods to cache. These methods are meant

‎book/service_container.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@ Core Symfony and Third-Party Bundle Services
978978
Since Symfony and all third-party bundles configure and retrieve their services
979979
via the container, you can easily access them or even use them in your own
980980
services. To keep things simple, Symfony by default does not require that
981-
controllers be defined as services. Furthermore, Symfony injects the entire
981+
controllersmustbe defined as services. Furthermore, Symfony injects the entire
982982
service container into your controller. For example, to handle the storage of
983983
information on a user's session, Symfony provides a ``session`` service,
984984
which you can access inside a standard controller as follows::

‎components/security/authentication.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ The default authentication manager is an instance of
7777

7878
use Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager;
7979

80-
// instances of Symfony\Component\Security\Core\Authentication\AuthenticationProviderInterface
80+
// instances of Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface
8181
$providers = array(...);
8282

8383
$authenticationManager = new AuthenticationProviderManager($providers);

‎contributing/code/core_team.rst‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,10 @@ Pull Request Merging Policy
117117

118118
A pull request **can be merged** if:
119119

120-
* Enough time was given for peer reviews (a few minutes for typos or minor
121-
changes, at least 2 days for "regular" pull requests, and 4 days for pull
122-
requests with "a significant impact");
120+
* It is a minor change [1]_;
123121

124-
* It is a minor change [1]_, regardless of the number of votes;
122+
* Enough time was given for peer reviews (at least 2 days for "regular"
123+
pull requests, and 4 days for pull requests with "a significant impact");
125124

126125
* At least the component's **Merger** or two other Core members voted ``+1``
127126
and no Core member voted ``-1``.

‎cookbook/assetic/uglifyjs.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Local Installation
4040
~~~~~~~~~~~~~~~~~~
4141

4242
It's also possible to install UglifyJS inside your project only, which is useful
43-
when your project requiresan specific UglifyJS version. To do this, install it
43+
when your project requiresa specific UglifyJS version. To do this, install it
4444
without the ``-g`` option and specify the path where to put the module:
4545

4646
..code-block::bash

‎cookbook/configuration/using_parameters_in_dic.rst‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,8 @@ Now, examine the results to see this closely:
9393
In order to support this use case, the ``Configuration`` class has to
9494
be injected with this parameter via the extension as follows::
9595

96-
namespaceAcme\DemoBundle\DependencyInjection;
96+
namespaceAppBundle\DependencyInjection;
9797

98-
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
9998
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
10099
use Symfony\Component\Config\Definition\ConfigurationInterface;
101100

@@ -130,9 +129,7 @@ And set it in the constructor of ``Configuration`` via the ``Extension`` class::
130129
namespace AppBundle\DependencyInjection;
131130

132131
use Symfony\Component\DependencyInjection\ContainerBuilder;
133-
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
134132
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
135-
use Symfony\Component\Config\FileLocator;
136133

137134
class AppExtension extends Extension
138135
{

‎cookbook/configuration/web_server_configuration.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The **minimum configuration** to get your application running under Apache is:
4545
DocumentRoot /var/www/project/web
4646
<Directory /var/www/project/web>
4747
AllowOverride All
48-
Orderallow, deny
48+
OrderAllow,Deny
4949
Allow from All
5050
</Directory>
5151
@@ -76,7 +76,7 @@ and increase web server performance:
7676
DocumentRoot /var/www/project/web
7777
<Directory /var/www/project/web>
7878
AllowOverride None
79-
Orderallow, deny
79+
OrderAllow,Deny
8080
Allow from All
8181
8282
<IfModule mod_rewrite.c>
@@ -110,7 +110,7 @@ and increase web server performance:
110110
Using mod_php/PHP-CGI with Apache 2.4
111111
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
112112

113-
In Apache 2.4, ``Orderallow,deny`` has been replaced by ``Require all granted``.
113+
In Apache 2.4, ``OrderAllow,Deny`` has been replaced by ``Require all granted``.
114114
Hence, you need to modify your ``Directory`` permission settings as follows:
115115

116116
..code-block::apache
@@ -223,7 +223,7 @@ should look something like this:
223223
<Directory /var/www/project/web>
224224
# enable the .htaccess rewrites
225225
AllowOverride All
226-
Orderallow, deny
226+
OrderAllow,Deny
227227
Allow from all
228228
</Directory>
229229

‎cookbook/email/email.rst‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,8 @@ an email is pretty straightforward::
9393

9494
public function indexAction($name)
9595
{
96-
$mailer = $this->get('mailer');
97-
$message = $mailer->createMessage()
98-
->setSubject('You have Completed Registration!')
96+
$message = \Swift_Message::newInstance()
97+
->setSubject('Hello Email')
9998
->setFrom('send@example.com')
10099
->setTo('recipient@example.com')
101100
->setBody(
@@ -117,7 +116,7 @@ an email is pretty straightforward::
117116
)
118117
*/
119118
;
120-
$mailer->send($message);
119+
$this->get('mailer')->send($message);
121120

122121
return $this->render(...);
123122
}

‎reference/constraints/_payload-option.rst.inc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ payload
88

99
This option can be used to attach arbitrary domain-specific data to a constraint.
1010
The configured payload is not used by the Validator component, but its processing
11-
is completely up to.
11+
is completely up to you.
1212

13-
For example, you may want toused
13+
For example, you may want touse
1414
:doc:`several error levels</cookbook/validation/severity>` to present failed
15-
constraint differently in the front-end depending on the severity of the
15+
constraints differently in the front-end depending on the severity of the
1616
error.

0 commit comments

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