Skip to content

Commit

Permalink
Merge branch '2.3' into 2.7
Browse files Browse the repository at this point in the history
  • Loading branch information
wouterj committed Apr 18, 2016
2 parents 139e2e7 + 1653948 commit cf61d87
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion components/security/authorization.rst
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ on a "remember-me" cookie, or even authenticated anonymously?
// any object
$object = ...;
$vote = $authenticatedVoter->vote($token, $object, array('IS_AUTHENTICATED_FULLY');
$vote = $authenticatedVoter->vote($token, $object, array('IS_AUTHENTICATED_FULLY'));
RoleVoter
~~~~~~~~~
Expand Down
4 changes: 1 addition & 3 deletions cookbook/assetic/php.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,8 @@ directory and execute the following commands:
.. code-block:: bash
$ composer require leafo/scssphp
$ composer require patchwork/jsqueeze:"~1.0"
$ composer require patchwork/jsqueeze
It's very important to maintain the ``~1.0`` version constraint for the ``jsqueeze``
dependency because the most recent stable version is not compatible with Assetic.
Organizing your Web Asset Files
-------------------------------
Expand Down
4 changes: 2 additions & 2 deletions cookbook/bundles/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ For the configuration example in the previous section, the array passed to your
array(
'twitter' => array(
'client_id' => 123,
'client_secret' => '$secret',
'client_secret' => 'your_secret',
),
),
)
Expand All @@ -155,7 +155,7 @@ beneath it, the incoming array might look like this::
array(
'twitter' => array(
'client_id' => 123,
'client_secret' => '$secret',
'client_secret' => 'your_secret',
),
),
// values from config_dev.yml
Expand Down
2 changes: 1 addition & 1 deletion cookbook/workflow/homestead.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ quickly.
.. tip::

Due to the amount of filesystem operations in Symfony (e.g. updating cache
files and writing to log files), Symfony can slow down signifcantly. To
files and writing to log files), Symfony can slow down significantly. To
improve the speed, consider :ref:`overriding the cache and log directories <override-cache-dir>`
to a location outside the NFS share (for instance, by using
:phpfunction:`sys_get_temp_dir`). You can read `this blog post`_ for more
Expand Down
Binary file modified images/request-flow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit cf61d87

Please sign in to comment.