Skip to content

Commit 2b2a86f

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: Update license.rst Fix method link to isCsrfTokenValid Fix link reference in Upgrading to Symfony Flex
2 parents 8f83b9e + 8055e8b commit 2b2a86f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

contributing/code/license.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Symfony Code License
55

66
Symfony code is released under `the MIT license`_:
77

8-
Copyright (c) 2004-2020 Fabien Potencier
8+
Copyright (c) 2004-2021 Fabien Potencier
99

1010
Permission is hereby granted, free of charge, to any person obtaining a copy
1111
of this software and associated documentation files (the "Software"), to deal

security/csrf.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ generate a CSRF token in the template and store it as a hidden form field:
150150
</form>
151151

152152
Then, get the value of the CSRF token in the controller action and use the
153-
:method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController::isCsrfTokenValid`
154-
to check its validity::
153+
:method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerTrait::isCsrfTokenValid`
154+
method to check its validity::
155155

156156
use Symfony\Component\HttpFoundation\Request;
157157
use Symfony\Component\HttpFoundation\Response;

0 commit comments

Comments
 (0)