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

Commit8e63221

Browse files
committed
Merge branch '2.2' into 2.3
2 parents3cda092 +142f2b8 commit8e63221

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

‎contributing/code/security.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ Security Advisories
9696
This section indexes security vulnerabilities that were fixed in Symfony
9797
releases, starting from Symfony 1.0.0:
9898

99+
* October 10, 2013: `Security releases: Symfony 2.0.25, 2.1.13, 2.2.9, and 2.3.6 released<http://symfony.com/blog/security-releases-cve-2013-5958-symfony-2-0-25-2-1-13-2-2-9-and-2-3-6-released>`_ (`CVE-2013-5958<http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-5958>`_)
99100
* August 7, 2013: `Security releases: Symfony 2.0.24, 2.1.12, 2.2.5, and 2.3.3 released<http://symfony.com/blog/security-releases-symfony-2-0-24-2-1-12-2-2-5-and-2-3-3-released>`_ (`CVE-2013-4751<http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4751>`_ and `CVE-2013-4752<http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4752>`_)
100101
* January 17, 2013: `Security release: Symfony 2.0.22 and 2.1.7 released<http://symfony.com/blog/security-release-symfony-2-0-22-and-2-1-7-released>`_ (`CVE-2013-1348<http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1348>`_ and `CVE-2013-1397<http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1397>`_)
101102
* December 20, 2012: `Security release: Symfony 2.0.20 and 2.1.5<http://symfony.com/blog/security-release-symfony-2-0-20-and-2-1-5-released>`_ (`CVE-2012-6431<http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-6431>`_ and `CVE-2012-6432<http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-6432>`_)

‎cookbook/cache/varnish.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ How to use Varnish to speed up my Website
66

77
Because Symfony2's cache uses the standard HTTP cache headers, the
88
:ref:`symfony-gateway-cache` can easily be replaced with any other reverse
9-
proxy. Varnish is a powerful, open-source, HTTP accelerator capable of serving
9+
proxy.`Varnish`_ is a powerful, open-source, HTTP accelerator capable of serving
1010
cached content quickly and including support for:ref:`Edge Side Includes<edge-side-includes>`.
1111

1212
..index::
@@ -206,5 +206,6 @@ absolute URLs:
206206
in the Symfony configuration so that Varnish is seen as a trusted proxy
207207
and the ``X-Forwarded-`` headers are used.
208208

209+
.. _`Varnish`:https://www.varnish-cache.org
209210
.. _`Edge Architecture`:http://www.w3.org/TR/edge-arch
210211
.. _`GZIP and Varnish`:https://www.varnish-cache.org/docs/3.0/phk/gzip.html

‎cookbook/console/console_command.rst

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,11 @@ instead of
105105
$command = $application->find('demo:greet');
106106
$commandTester = new CommandTester($command);
107107
$commandTester->execute(
108-
array(
109-
'name' => 'Fabien',
110-
'--yell' => true,
111-
)
108+
array(
109+
'command' => $command->getName(),
110+
'name' => 'Fabien',
111+
'--yell' => true,
112+
)
112113
);
113114

114115
$this->assertRegExp('/.../', $commandTester->getDisplay());
@@ -145,10 +146,11 @@ you can extend your test from
145146
$command = $application->find('demo:greet');
146147
$commandTester = new CommandTester($command);
147148
$commandTester->execute(
148-
array(
149-
'name' => 'Fabien',
150-
'--yell' => true,
151-
)
149+
array(
150+
'command' => $command->getName(),
151+
'name' => 'Fabien',
152+
'--yell' => true,
153+
)
152154
);
153155

154156
$this->assertRegExp('/.../', $commandTester->getDisplay());

0 commit comments

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