Skip to content

Commit b68663a

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: Adding typehint Corrected minor grammar mistake in the routing docs
2 parents b323603 + 35d498f commit b68663a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

routing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2216,8 +2216,8 @@ Stateless Routes
22162216
The ``stateless`` option was introduced in Symfony 5.1.
22172217

22182218
Sometimes, when an HTTP response should be cached, it is important to ensure
2219-
that can happen. However, whenever session is started during a request, Symfony
2220-
turns the response into a private non-cacheable response.
2219+
that can happen. However, whenever a session is started during a request,
2220+
Symfony turns the response into a private non-cacheable response.
22212221

22222222
For details, see :doc:`/http_cache`.
22232223

security/guard_authentication.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ This requires you to implement several methods::
187187
return true;
188188
}
189189

190-
public function onAuthenticationSuccess(Request $request, TokenInterface $token, $providerKey)
190+
public function onAuthenticationSuccess(Request $request, TokenInterface $token, string $providerKey)
191191
{
192192
// on success, let the request continue
193193
return null;

0 commit comments

Comments
 (0)