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

Commit18ebdda

Browse files
committed
Merge branch '2.1' into 2.2
2 parentsc856495 +cf2bb38 commit18ebdda

File tree

15 files changed

+71
-37
lines changed

15 files changed

+71
-37
lines changed

‎book/http_cache.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,8 +533,8 @@ example).
533533
..tip::
534534

535535
The 304 status code means "Not Modified". It's important because with
536-
this status codedo*not* contain the actual content being requested.
537-
Instead, the response is simply a light-weight set of directions that
536+
this status codethe response does*not* contain the actual content being
537+
requested.Instead, the response is simply a light-weight set of directions that
538538
tell cache that it should use its stored version.
539539

540540
Like with expiration, there are two different HTTP headers that can be used

‎book/performance.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Internally, this builds the big class map array in ``vendor/composer/autoload_cl
6767
Caching the Autoloader with APC
6868
-------------------------------
6969

70-
Another solution is totocache the location of each class after it's located
70+
Another solution is to cache the location of each class after it's located
7171
the first time. Symfony comes with a class -:class:`Symfony\\Component\\ClassLoader\\ApcClassLoader` -
7272
that does exactly this. To use it, just adapt your front controller file.
7373
If you're using the Standard Distribution, this code should already be available

‎book/security.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ First, enable form login under your firewall:
358358
359359
Now, when the security system initiates the authentication process, it will
360360
redirect the user to the login form (``/login`` by default). Implementing this
361-
login form visually is your job. First,thecreate two routeswe used in the
361+
login form visually is your job. First, createthetwo routesyou used in the
362362
security configuration: the ``login`` route will display the login form (i.e.
363363
``/login``) and the ``login_check`` route will handle the login form
364364
submission (i.e. ``/login_check``):

‎book/translation.rst‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ for example, that you're translating a simple message from inside a controller::
102102

103103
public function indexAction()
104104
{
105-
$t = $this->get('translator')->trans('Symfony2 is great');
105+
$translated = $this->get('translator')->trans('Symfony2 is great');
106106

107-
return new Response($t);
107+
return new Response($translated);
108108
}
109109

110110
When this code is executed, Symfony2 will attempt to translate the message
@@ -179,9 +179,9 @@ Sometimes, a message containing a variable needs to be translated::
179179

180180
public function indexAction($name)
181181
{
182-
$t = $this->get('translator')->trans('Hello '.$name);
182+
$translated = $this->get('translator')->trans('Hello '.$name);
183183

184-
return new Response($t);
184+
return new Response($translated);
185185
}
186186

187187
However, creating a translation for this string is impossible since the translator
@@ -195,12 +195,12 @@ variable with a "placeholder"::
195195

196196
public function indexAction($name)
197197
{
198-
$t = $this->get('translator')->trans(
198+
$translated = $this->get('translator')->trans(
199199
'Hello %name%',
200200
array('%name%' => $name)
201201
);
202202

203-
return new Response($t);
203+
return new Response($translated);
204204
}
205205

206206
Symfony2 will now look for a translation of the raw message (``Hello %name%``)
@@ -391,9 +391,9 @@ Symfony2 will discover these files and use them when translating either
391391
This example illustrates the two different philosophies when creating
392392
messages to be translated::
393393

394-
$t = $translator->trans('Symfony2 is great');
394+
$translated = $translator->trans('Symfony2 is great');
395395

396-
$t = $translator->trans('symfony2.great');
396+
$translated = $translator->trans('symfony2.great');
397397

398398
In the first method, messages are written in the language of the default
399399
locale (English in this case). That message is then used as the "id"
@@ -648,7 +648,7 @@ all the forms as a string separated by a pipe (``|``)::
648648
To translate pluralized messages, use the
649649
:method:`Symfony\\Component\\Translation\\Translator::transChoice` method::
650650

651-
$t = $this->get('translator')->transChoice(
651+
$translated = $this->get('translator')->transChoice(
652652
'There is one apple|There are %count% apples',
653653
10,
654654
array('%count%' => 10)
@@ -798,7 +798,7 @@ texts* and complex expressions:
798798
Using the translation tags or filters have the same effect, but with
799799
one subtle difference: automatic output escaping is only applied to
800800
translations using a filter. In other words, if you need to be sure
801-
that your translated is *not* output escaped, you must apply the
801+
that your translated is *not* output escaped, you must apply the
802802
``raw`` filter after the translation filter:
803803

804804
..code-block::jinja

‎components/dom_crawler.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,13 @@ The crawler supports multiple ways of adding the content::
160160
$crawler->add('<html><body /></html>');
161161
$crawler->add('<root><node /></root>');
162162

163+
..note::
164+
165+
When dealing with character sets other than ISO-8859-1, always add HTML
166+
content using the:method:`Symfony\\Component\\DomCrawler\\Crawler::addHTMLContent``
167+
method where you can specify the second parameter to be your target character
168+
set.
169+
163170
As the Crawler's implementation is based on the DOM extension, it is also able
164171
to interact with native:phpclass:`DOMDocument`,:phpclass:`DOMNodeList`
165172
and:phpclass:`DOMNode` objects:

‎components/process.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ anonymous function to the
5757

5858
$process = new Process('ls -lsa');
5959
$process->run(function ($type, $buffer) {
60-
if ('err' === $type) {
60+
if (Process::ERR === $type) {
6161
echo 'ERR > '.$buffer;
6262
} else {
6363
echo 'OUT > '.$buffer;
@@ -95,7 +95,7 @@ are done doing other stuff::
9595
// ... do other things
9696
9797
$process->wait(function ($type, $buffer) {
98-
if ('err' === $type) {
98+
if (Process:ERR === $type) {
9999
echo 'ERR > '.$buffer;
100100
} else {
101101
echo 'OUT > '.$buffer;

‎contributing/code/git.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ request (including comments) is saved in the repository.
1313
You can easily spot pull request merges as the commit message always follows
1414
this pattern:
1515

16-
.. block: text
16+
..code-block::text
1717
1818
merged branch USER_NAME/BRANCH_NAME (PR #1111)
1919
@@ -30,13 +30,13 @@ stored as a Git note (before March 22 2013, the discussion was part of the
3030
main merge commit message). To get access to these notes, add this line to
3131
your ``.git/config`` file:
3232

33-
.. block: text
33+
..code-block::ini
3434
3535
fetch = +refs/notes/*:refs/notes/*
3636
3737
After a fetch, getting the Github discussion for a commit is then a matter of
3838
adding ``--show-notes=github-comments`` to the ``git show`` command:
3939

40-
.. block: text
40+
..code-block::bash
4141
42-
git show HEAD --show-notes=github-comments
42+
$git show HEAD --show-notes=github-comments

‎cookbook/bundles/extension.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,6 @@ global parameters available to use:
423423
* ``kernel.root_dir``
424424
* ``kernel.cache_dir``
425425
* ``kernel.logs_dir``
426-
* ``kernel.bundle_dirs``
427426
* ``kernel.bundles``
428427
* ``kernel.charset``
429428

‎cookbook/configuration/web_server_configuration.rst‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ are:
2121
..code-block::apache
2222
2323
<VirtualHost *:80>
24-
ServerName www.domain.tld
24+
ServerName domain.tld
25+
ServerAlias www.domain.tld
2526
2627
DocumentRoot /var/www/project/web
2728
<Directory /var/www/project/web>
@@ -30,7 +31,7 @@ are:
3031
Order allow,deny
3132
Allow from All
3233
</Directory>
33-
34+
3435
ErrorLog /var/log/apache2/project_error.log
3536
CustomLog /var/log/apache2/project_access.log combined
3637
</VirtualHost>
@@ -59,7 +60,7 @@ are:
5960
..code-block::nginx
6061
6162
server {
62-
server_name www.domain.tld;
63+
server_namedomain.tldwww.domain.tld;
6364
root /var/www/project/web;
6465
6566
location / {
@@ -72,7 +73,7 @@ are:
7273
rewrite ^(.*)$ /app.php/$1 last;
7374
}
7475
75-
location ~ ^/(app|app_dev)\.php(/|$) {
76+
location ~ ^/(app|app_dev|config)\.php(/|$) {
7677
fastcgi_pass unix:/var/run/php5-fpm.sock;
7778
fastcgi_split_path_info ^(.+\.php)(/.*)$;
7879
include fastcgi_params;
@@ -91,10 +92,14 @@ are:
9192

9293
..tip::
9394

94-
This executes **only** ``app.php`` and ``app_dev.php`` in the web directory.
95-
All other files will be served as text. If you have other PHP files in
96-
your web directory, be sure to include them in the ``location`` block
97-
above.
95+
This executes **only** ``app.php``, ``app_dev.php`` and ``config.php`` in
96+
the web directory. All other files will be served as text. You **must**
97+
also make sure that if you *do* deploy ``app_dev.php`` or ``config.php``
98+
that these files are secured and not available to any outside user (the
99+
IP checking code at the top of each file does this by default).
100+
101+
If you have other PHP files in your web directory that need to be executed,
102+
be sure to include them in the ``location`` block above.
98103

99104
.. _`Apache`:http://httpd.apache.org/docs/current/mod/core.html#documentroot
100105
.. _`Nginx`:http://wiki.nginx.org/Symfony

‎cookbook/form/form_customization.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ Using Form Variables
947947
--------------------
948948

949949
Most of the functions available for rendering different parts of a form (e.g.
950-
the form widget, form label, formwidget, etc) also allow you to make certain
950+
the form widget, form label, formerrors, etc) also allow you to make certain
951951
customizations directly. Look at the following example:
952952

953953
..configuration-block::

0 commit comments

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