Skip to content

Commit 7f2e15b

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Fix small linguistic error minor Update http_cache.rst
2 parents e7287ea + 87bec30 commit 7f2e15b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

http_cache.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ method::
137137

138138
class CacheKernel extends HttpCache
139139
{
140-
protected function getOptions()
140+
protected function getOptions(): array
141141
{
142142
return [
143143
'default_ttl' => 0,

security/impersonating_user.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ Limiting User Switching
193193

194194
If you need more control over user switching, you can use a security voter. First,
195195
configure ``switch_user`` to check for some new, custom attribute. This can be
196-
anything, but *cannot* start with ``ROLE_`` (to enforce that only your voter will)
197-
be called:
196+
anything, but *cannot* start with ``ROLE_`` (to enforce that only your voter will
197+
be called):
198198

199199
.. configuration-block::
200200

0 commit comments

Comments
 (0)