Skip to content

Commit 2db6e18

Browse files
committed
Merge branch '2.8' into 3.0
2 parents 66b2469 + 84ded6c commit 2db6e18

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Diff for: book/controller.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@ Just like when creating a controller for a route, the order of the arguments of
806806
order of the arguments, Symfony will still pass the correct value to each
807807
variable.
808808

809-
.. _checking-the-validity-of-a-csrf-token::
809+
.. _checking-the-validity-of-a-csrf-token:
810810

811811
Validating a CSRF Token
812812
-----------------------

Diff for: components/security/authentication.rst

+7-7
Original file line numberDiff line numberDiff line change
@@ -274,14 +274,14 @@ Authentication Events
274274

275275
The security component provides 4 related authentication events:
276276

277-
=============================== ================================================ =========================================================================
277+
=============================== ================================================ ==============================================================================
278278
Name Event Constant Argument Passed to the Listener
279-
=============================== ================================================ =========================================================================
280-
security.authentication.success ``AuthenticationEvents::AUTHENTICATION_SUCCESS`` :class:`Symfony\Component\Security\Core\Event\AuthenticationEvent`
281-
security.authentication.failure ``AuthenticationEvents::AUTHENTICATION_FAILURE`` :class:`Symfony\Component\Security\Core\Event\AuthenticationFailureEvent`
282-
security.interactive_login ``SecurityEvents::INTERACTIVE_LOGIN`` :class:`Symfony\Component\Security\Http\Event\InteractiveLoginEvent`
283-
security.switch_user ``SecurityEvents::SWITCH_USER`` :class:`Symfony\Component\Security\Http\Event\SwitchUserEvent`
284-
=============================== ================================================ =========================================================================
279+
=============================== ================================================ ==============================================================================
280+
security.authentication.success ``AuthenticationEvents::AUTHENTICATION_SUCCESS`` :class:`Symfony\\Component\\Security\\Core\\Event\\AuthenticationEvent`
281+
security.authentication.failure ``AuthenticationEvents::AUTHENTICATION_FAILURE`` :class:`Symfony\\Component\\Security\\Core\\Event\\AuthenticationFailureEvent`
282+
security.interactive_login ``SecurityEvents::INTERACTIVE_LOGIN`` :class:`Symfony\\Component\\Security\\Http\\Event\\InteractiveLoginEvent`
283+
security.switch_user ``SecurityEvents::SWITCH_USER`` :class:`Symfony\\Component\\Security\\Http\\Event\\SwitchUserEvent`
284+
=============================== ================================================ ==============================================================================
285285

286286
Authentication Success and Failure Events
287287
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Diff for: cookbook/assetic/_standard_edition_warning.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. caution::
2-
2+
33
Starting from Symfony 2.8, Assetic is no longer included by default in the
44
Symfony Standard Edition. Refer to :doc:`this article </cookbook/assetic/asset_management>`
55
to learn how to install and enable Assetic in your Symfony application.

0 commit comments

Comments
 (0)