Skip to content

Commit 657ba99

Browse files
committed
Merge branch '2.8' into 3.0
* 2.8: [#6263] Javier's comments remove dot in front of colon reflect behavior changes in cache generation [#6032] fix link to ROT13 description
2 parents 4924513 + 3d3bac0 commit 657ba99

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

Diff for: components/dependency_injection/autowiring.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ typehint which is useful in the field of `Rapid Application Development`_,
1313
when designing prototypes in early stages of large projects. It makes it easy
1414
to register a service graph and eases refactoring.
1515

16-
Imagine you're building an API to publish statuses on a Twitter feed, which
17-
has to be obfuscated with ``ROT13`` (a special case of the Caesar cipher).
16+
Imagine you're building an API to publish statuses on a Twitter feed, obfuscated
17+
with `ROT13`_ (a special case of the Caesar cipher).
1818

1919
Start by creating a ROT13 transformer class::
2020

Diff for: cookbook/debugging.rst

+10-10
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ Disabling the Bootstrap File and Class Caching
2121

2222
And to make the production environment as fast as possible, Symfony creates
2323
big PHP files in your cache containing the aggregation of PHP classes your
24-
project needs for every request. However, this behavior can confuse your IDE
25-
or your debugger. This recipe shows you how you can tweak this caching
26-
mechanism to make it friendlier when you need to debug code that involves
27-
Symfony classes.
24+
project needs for every request. However, this behavior can confuse your debugger,
25+
because the same class can be located in two different places: the original class
26+
file and the big file which aggregates lots of classes.
27+
28+
This recipe shows you how you can tweak this caching mechanism to make it friendlier
29+
when you need to debug code that involves Symfony classes.
2830

2931
The ``app_dev.php`` front controller reads as follows by default::
3032

@@ -38,8 +40,8 @@ The ``app_dev.php`` front controller reads as follows by default::
3840
$request = Request::createFromGlobals();
3941
// ...
4042

41-
To make your debugger happier, disable all PHP class caches by removing (or
42-
commenting) the call to ``loadClassCache()``::
43+
To make your debugger happier, disable the loading of all PHP class caches
44+
by removing the call to ``loadClassCache()``::
4345

4446
// ...
4547

@@ -56,7 +58,5 @@ commenting) the call to ``loadClassCache()``::
5658
session.
5759

5860
Some IDEs do not like the fact that some classes are stored in different
59-
locations. To avoid problems, you can either tell your IDE to ignore the PHP
60-
cache files, or you can change the extension used by Symfony for these files::
61-
62-
$kernel->loadClassCache('classes', '.php.cache');
61+
locations. To avoid problems, you can tell your IDE to ignore the PHP cache
62+
file.

Diff for: cookbook/form/data_transformers.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ Next, you need to instantiate the ``IssueToNumberTransformer`` class from inside
254254
of the entity manager (because ``IssueToNumberTransformer`` needs this).
255255

256256
No problem! Just add a ``__construct()`` function to ``TaskType`` and force this
257-
to be passed in by registering ``TaskType`` as a service.::
257+
to be passed in by registering ``TaskType`` as a service::
258258

259259
// src/AppBundle/Form/TaskType.php
260260
namespace AppBundle\Form\Type;

0 commit comments

Comments
 (0)