Skip to content

Commit

Permalink
Merge branch '2.8' into 3.0
Browse files Browse the repository at this point in the history
* 2.8:
  [#6263] Javier's comments
  remove dot in front of colon
  reflect behavior changes in cache generation
  [#6032] fix link to ROT13 description
  • Loading branch information
weaverryan committed Feb 21, 2016
2 parents 4924513 + 3d3bac0 commit 657ba99
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions components/dependency_injection/autowiring.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ typehint which is useful in the field of `Rapid Application Development`_,
when designing prototypes in early stages of large projects. It makes it easy
to register a service graph and eases refactoring.

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

Start by creating a ROT13 transformer class::

Expand Down
20 changes: 10 additions & 10 deletions cookbook/debugging.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ Disabling the Bootstrap File and Class Caching

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

This recipe shows you how you can tweak this caching mechanism to make it friendlier
when you need to debug code that involves Symfony classes.

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

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

To make your debugger happier, disable all PHP class caches by removing (or
commenting) the call to ``loadClassCache()``::
To make your debugger happier, disable the loading of all PHP class caches
by removing the call to ``loadClassCache()``::

// ...

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

Some IDEs do not like the fact that some classes are stored in different
locations. To avoid problems, you can either tell your IDE to ignore the PHP
cache files, or you can change the extension used by Symfony for these files::

$kernel->loadClassCache('classes', '.php.cache');
locations. To avoid problems, you can tell your IDE to ignore the PHP cache
file.
2 changes: 1 addition & 1 deletion cookbook/form/data_transformers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ Next, you need to instantiate the ``IssueToNumberTransformer`` class from inside
of the entity manager (because ``IssueToNumberTransformer`` needs this).

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

// src/AppBundle/Form/TaskType.php
namespace AppBundle\Form\Type;
Expand Down

0 comments on commit 657ba99

Please sign in to comment.