Skip to content

Commit cf61d87

Browse files
committed
Merge branch '2.3' into 2.7
2 parents 139e2e7 + 1653948 commit cf61d87

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

components/security/authorization.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ on a "remember-me" cookie, or even authenticated anonymously?
120120
// any object
121121
$object = ...;
122122
123-
$vote = $authenticatedVoter->vote($token, $object, array('IS_AUTHENTICATED_FULLY');
123+
$vote = $authenticatedVoter->vote($token, $object, array('IS_AUTHENTICATED_FULLY'));
124124
125125
RoleVoter
126126
~~~~~~~~~

cookbook/assetic/php.rst

+1-3
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,8 @@ directory and execute the following commands:
3333
.. code-block:: bash
3434
3535
$ composer require leafo/scssphp
36-
$ composer require patchwork/jsqueeze:"~1.0"
36+
$ composer require patchwork/jsqueeze
3737
38-
It's very important to maintain the ``~1.0`` version constraint for the ``jsqueeze``
39-
dependency because the most recent stable version is not compatible with Assetic.
4038
4139
Organizing your Web Asset Files
4240
-------------------------------

cookbook/bundles/configuration.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ For the configuration example in the previous section, the array passed to your
139139
array(
140140
'twitter' => array(
141141
'client_id' => 123,
142-
'client_secret' => '$secret',
142+
'client_secret' => 'your_secret',
143143
),
144144
),
145145
)
@@ -155,7 +155,7 @@ beneath it, the incoming array might look like this::
155155
array(
156156
'twitter' => array(
157157
'client_id' => 123,
158-
'client_secret' => '$secret',
158+
'client_secret' => 'your_secret',
159159
),
160160
),
161161
// values from config_dev.yml

cookbook/workflow/homestead.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ quickly.
1111
.. tip::
1212

1313
Due to the amount of filesystem operations in Symfony (e.g. updating cache
14-
files and writing to log files), Symfony can slow down signifcantly. To
14+
files and writing to log files), Symfony can slow down significantly. To
1515
improve the speed, consider :ref:`overriding the cache and log directories <override-cache-dir>`
1616
to a location outside the NFS share (for instance, by using
1717
:phpfunction:`sys_get_temp_dir`). You can read `this blog post`_ for more

images/request-flow.png

-5.13 KB
Loading

0 commit comments

Comments
 (0)