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
Appearance settings

Commit 51224e9

Browse filesBrowse files
wouterjwouterj
committed
Merge branch '2.7'
2 parents 0c92fab + f8226e2 commit 51224e9
Copy full SHA for 51224e9

File tree

Expand file treeCollapse file tree

12 files changed

+299
-185
lines changed
Filter options
Expand file treeCollapse file tree

12 files changed

+299
-185
lines changed

‎best_practices/business-logic.rst

Copy file name to clipboardExpand all lines: best_practices/business-logic.rst
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Inside here, you can create whatever directories you want to organize things:
1515

1616
.. code-block:: text
1717
18-
symfoy2-project/
18+
symfony2-project/
1919
├─ app/
2020
├─ src/
2121
│ └─ AppBundle/
@@ -33,7 +33,7 @@ and put things there:
3333

3434
.. code-block:: text
3535
36-
symfoy2-project/
36+
symfony2-project/
3737
├─ app/
3838
├─ src/
3939
│ ├─ Acme/
@@ -299,7 +299,7 @@ Then, enable the bundle in ``AppKernel.php``, but only for the ``dev`` and
299299
300300
if (in_array($this->getEnvironment(), array('dev', 'test'))) {
301301
// ...
302-
$bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
302+
$bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();
303303
}
304304
305305
return $bundles;

‎best_practices/web-assets.rst

Copy file name to clipboardExpand all lines: best_practices/web-assets.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ tools like GruntJS.
5050
comfortable with frontend tools like GruntJS.
5151

5252
`Assetic`_ is an asset manager capable of compiling assets developed with
53-
a lot of different frontend technologies like LESS, Sass and CoffeScript.
53+
a lot of different frontend technologies like LESS, Sass and CoffeeScript.
5454
Combining all your assets with Assetic is a matter of wrapping all the assets
5555
with a single Twig tag:
5656

‎book/doctrine.rst

Copy file name to clipboardExpand all lines: book/doctrine.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -747,8 +747,8 @@ normal ``Query`` object, which can be used to get the result of the query.
747747
(``:price`` in the example above) as it prevents SQL injection attacks.
748748

749749
The ``getResult()`` method returns an array of results. To get only one
750-
result, you can use ``getSingleResult()`` (which throws exception there is no
751-
result) or ``getOneOrNullResult()``::
750+
result, you can use ``getSingleResult()`` (which throws an exception if there
751+
is no result) or ``getOneOrNullResult()``::
752752

753753
$product = $query->getOneOrNullResult();
754754

‎book/http_cache.rst

Copy file name to clipboardExpand all lines: book/http_cache.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -763,8 +763,7 @@ at some interval (the expiration) to verify that the content is still valid.
763763
.. tip::
764764

765765
You can also define HTTP caching headers for expiration and validation by using
766-
annotations. See the
767-
`FrameworkExtraBundle documentation <http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/cache.html>`_.
766+
annotations. See the `FrameworkExtraBundle documentation`_.
768767

769768
.. index::
770769
pair: Cache; Configuration
@@ -1130,4 +1129,5 @@ Learn more from the Cookbook
11301129
.. _`HTTP Bis`: http://tools.ietf.org/wg/httpbis/
11311130
.. _`P4 - Conditional Requests`: http://tools.ietf.org/html/draft-ietf-httpbis-p4-conditional
11321131
.. _`P6 - Caching: Browser and intermediary caches`: http://tools.ietf.org/html/draft-ietf-httpbis-p6-cache
1132+
.. _`FrameworkExtraBundle documentation`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/cache.html
11331133
.. _`ESI`: http://www.w3.org/TR/esi-lang

‎book/routing.rst

Copy file name to clipboardExpand all lines: book/routing.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1209,7 +1209,7 @@ see :ref:`route-parameters-controller-arguments`.
12091209
.. tip::
12101210

12111211
The special ``$_route`` variable is set to the name of the route that was
1212-
matced.
1212+
matched.
12131213

12141214
You can even add extra information to your route definition and access it
12151215
within your controller. For more information on this topic,

‎components/dependency_injection/tags.rst

Copy file name to clipboardExpand all lines: components/dependency_injection/tags.rst
+8-8Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ custom tag::
153153
$taggedServices = $container->findTaggedServiceIds(
154154
'acme_mailer.transport'
155155
);
156-
foreach ($taggedServices as $id => $attributes) {
156+
foreach ($taggedServices as $id => $tags) {
157157
$definition->addMethodCall(
158158
'addTransport',
159159
array(new Reference($id))
@@ -178,7 +178,7 @@ run when the container is compiled::
178178
use Symfony\Component\DependencyInjection\ContainerBuilder;
179179

180180
$container = new ContainerBuilder();
181-
$container->addCompilerPass(new TransportCompilerPass);
181+
$container->addCompilerPass(new TransportCompilerPass());
182182

183183
.. note::
184184

@@ -291,8 +291,8 @@ use this, update the compiler::
291291
$taggedServices = $container->findTaggedServiceIds(
292292
'acme_mailer.transport'
293293
);
294-
foreach ($taggedServices as $id => $tagAttributes) {
295-
foreach ($tagAttributes as $attributes) {
294+
foreach ($taggedServices as $id => $tags) {
295+
foreach ($tags as $attributes) {
296296
$definition->addMethodCall(
297297
'addTransport',
298298
array(new Reference($id), $attributes["alias"])
@@ -302,7 +302,7 @@ use this, update the compiler::
302302
}
303303
}
304304

305-
The trickiest part is the ``$attributes`` variable. Because you can use the
306-
same tag many times on the same service (e.g. you could theoretically tag
307-
the same service 5 times with the ``acme_mailer.transport`` tag), ``$attributes``
308-
is an array of the tag information for each tag on that service.
305+
The double loop may be confusing. This is because a service can have more than one
306+
tag. You tag a service twice or more with the ``acme_mailer.transport`` tag. The
307+
second foreach loop iterates over the ``acme_mailer.transport`` tags set for the
308+
current service and gives you the attributes.

‎conf.py

Copy file name to clipboardExpand all lines: conf.py
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
# adding PhpLexer
2424
from sphinx.highlighting import lexers
25+
from pygments.lexers.compiled import CLexer
2526
from pygments.lexers.web import PhpLexer
26-
from pygments.lexers.agile import RubyLexer
2727

2828
# -- General configuration -----------------------------------------------------
2929

@@ -101,9 +101,9 @@
101101
lexers['php-annotations'] = PhpLexer(startinline=True)
102102
lexers['php-standalone'] = PhpLexer(startinline=True)
103103
lexers['php-symfony'] = PhpLexer(startinline=True)
104-
lexers['varnish2'] = RubyLexer()
105-
lexers['varnish3'] = RubyLexer()
106-
lexers['varnish4'] = RubyLexer()
104+
lexers['varnish2'] = CLexer()
105+
lexers['varnish3'] = CLexer()
106+
lexers['varnish4'] = CLexer()
107107

108108
config_block = {
109109
'varnish2': 'Varnish 2',

‎contributing/community/releases.rst

Copy file name to clipboardExpand all lines: contributing/community/releases.rst
+6-2Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,16 @@ Version Feature Freeze Release End of Maintenance End of Life
9696
2.4 09/2013 11/2013 09/2014 (10 months [1]_) 01/2015
9797
2.5 02/2014 05/2014 01/2015 (8 months) 07/2015
9898
2.6 09/2014 11/2014 07/2015 (8 months) 01/2016
99-
**2.7** 02/2015 05/2015 05/2018 (36 months) 05/2019
100-
2.8 09/2015 11/2015 07/2016 (8 months) 01/2017
99+
**2.7** 02/2015 05/2015 05/2018 (36 months [2]_) 05/2019
100+
3.0 09/2015 11/2015 07/2016 (8 months) 01/2017
101+
3.1 02/2016 05/2016 01/2017 (8 months) 07/2017
102+
3.2 09/2016 11/2016 07/2017 (8 months) 01/2018
103+
**3.3** 02/2017 05/2017 05/2020 (36 months) 05/2021
101104
... ... ... ... ...
102105
======= ============== ======= ======================== ===========
103106

104107
.. [1] Symfony 2.4 maintenance has been `extended to September 2014`_.
108+
.. [2] Symfony 2.7 is the last version of the Symfony 2.x branch.
105109
106110
.. tip::
107111

‎cookbook/cache/varnish.rst

Copy file name to clipboardExpand all lines: cookbook/cache/varnish.rst
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ First, configure Varnish so that it advertises its ESI support by adding a
3838
``Surrogate-Capability`` header to requests forwarded to the backend
3939
application:
4040

41-
.. code-block:: text
41+
.. code-block:: varnish4
4242
4343
sub vcl_recv {
4444
// Add a Surrogate-Capability header to announce ESI support.
@@ -137,7 +137,7 @@ proxy before it has expired, it adds complexity to your caching setup.
137137
Varnish can be configured to accept a special HTTP ``PURGE`` method
138138
that will invalidate the cache for a given resource:
139139

140-
.. code-block:: text
140+
.. code-block:: varnish4
141141
142142
/*
143143
Connect to the backend server
@@ -186,7 +186,7 @@ that will invalidate the cache for a given resource:
186186
You must protect the ``PURGE`` HTTP method somehow to avoid random people
187187
purging your cached data. You can do this by setting up an access list:
188188

189-
.. code-block:: text
189+
.. code-block:: varnish4
190190
191191
/*
192192
Connect to the backend server
@@ -252,7 +252,7 @@ is 80 and not 8080.
252252
If this header weren't set properly, Symfony may append ``8080`` when generating
253253
absolute URLs:
254254

255-
.. code-block:: text
255+
.. code-block:: varnish4
256256
257257
sub vcl_recv {
258258
if (req.http.X-Forwarded-Proto == "https" ) {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.