summaryrefslogtreecommitdiffstats
path: root/Csrf
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2014-05-12 11:28:39 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2014-05-12 11:28:39 +0200
commit37b22fa270d2d3a4a6549f548a9a30685a30ffde (patch)
treeac9d4f30393818c2a76bd99de1e8de6ef7fcca79 /Csrf
parent8ed00906f2841b145735c9a01a4905baa57be310 (diff)
parent2fea8ebda136c2a1457afa8a1428ac18444fd156 (diff)
downloadsymfony-security-37b22fa270d2d3a4a6549f548a9a30685a30ffde.zip
symfony-security-37b22fa270d2d3a4a6549f548a9a30685a30ffde.tar.gz
symfony-security-37b22fa270d2d3a4a6549f548a9a30685a30ffde.tar.bz2
Merge branch '2.4'
* 2.4: Lower mbstring dependency [Console]Improve formatter for double-width character Lower mbstring dep, remove it for Yaml and CssSelector components [Security] Add check for supported attributes in AclVoter [Form] Fixed TrimListenerTest as of PHP 5.5 Added more IDE links [DependencyInjection] Fix parameter description in ConfigurationExtensionInterface [Security] fixed wrong PHPDoc of the TokenGeneratorInterface [Finder] fixed typehint of the Finder::addAdapter() method [TwigBridge][Transchoice] set %count% from the current context. [DependencyInjection] Fix travis unit tests Update PHPUnit before run [Validator] fixed wrong test [WebProfilerBundle] added test case for #10773 [WebProfilerBundle] fixed profiler homepage, fixed #10806 [WebProfilerBundle] Added test case for #10806 changed travis to run on the nightly builds of HHVM until everything gets stable Fixed issue #5427 Allow URLs that don't contain a path Conflicts: .travis.yml src/Symfony/Component/Console/Application.php
Diffstat (limited to 'Csrf')
-rw-r--r--Csrf/TokenGenerator/TokenGeneratorInterface.php14
1 files changed, 1 insertions, 13 deletions
diff --git a/Csrf/TokenGenerator/TokenGeneratorInterface.php b/Csrf/TokenGenerator/TokenGeneratorInterface.php
index 4d81da9..e02ac66 100644
--- a/Csrf/TokenGenerator/TokenGeneratorInterface.php
+++ b/Csrf/TokenGenerator/TokenGeneratorInterface.php
@@ -12,19 +12,7 @@
namespace Symfony\Component\Security\Csrf\TokenGenerator;
/**
- * Generates and validates CSRF tokens.
- *
- * You can generate a CSRF token by using the method {@link generateCsrfToken()}.
- * This method expects a unique token ID as argument. The token ID can later be
- * used to validate a token provided by the user.
- *
- * Token IDs do not necessarily have to be secret, but they should NEVER be
- * created from data provided by the client. A good practice is to hard-code the
- * token IDs for the various CSRF tokens used by your application.
- *
- * You should use the method {@link isCsrfTokenValid()} to check a CSRF token
- * submitted by the client. This method will return true if the CSRF token is
- * valid.
+ * Generates CSRF tokens.
*
* @since 2.4
* @author Bernhard Schussek <bschussek@gmail.com>