diff options
author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-07-05 13:05:26 +0200 |
---|---|---|
committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-07-05 13:05:26 +0200 |
commit | 6f72bc79990abf02dc7fe9792d6909c1ef333998 (patch) | |
tree | fb4ce32819da38a31954e6bba7a1eaf89b2473f3 | |
parent | 3d8dfdd9c145b9a1689edf287430b73896ac53ec (diff) | |
parent | b3409eca8afc51fb67f47854b087f994f5a4c67b (diff) | |
download | symfony-security-6f72bc79990abf02dc7fe9792d6909c1ef333998.zip symfony-security-6f72bc79990abf02dc7fe9792d6909c1ef333998.tar.gz symfony-security-6f72bc79990abf02dc7fe9792d6909c1ef333998.tar.bz2 |
Merge branch '2.7' into 2.8
* 2.7:
removed @since
Remove and change unrelevant comments in Validator and Security components.
[Validator] UuidValidator must accept a Uuid constraint.
[Validator] make UuidValidator class formatting consistent.
-rw-r--r-- | Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php | 2 | ||||
-rw-r--r-- | Csrf/CsrfTokenManagerInterface.php | 2 | ||||
-rw-r--r-- | Csrf/TokenGenerator/TokenGeneratorInterface.php | 2 | ||||
-rw-r--r-- | Csrf/TokenGenerator/UriSafeTokenGenerator.php | 2 | ||||
-rw-r--r-- | Csrf/TokenStorage/NativeSessionTokenStorage.php | 2 | ||||
-rw-r--r-- | Csrf/TokenStorage/SessionTokenStorage.php | 4 | ||||
-rw-r--r-- | Csrf/TokenStorage/TokenStorageInterface.php | 2 |
7 files changed, 1 insertions, 15 deletions
diff --git a/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php b/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php index 8053732..f7da8c0 100644 --- a/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php +++ b/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php @@ -14,8 +14,6 @@ namespace Symfony\Component\Security\Core\Tests\Validator\Constraints; use Symfony\Component\Validator\Validation; /** - * @since 2.5.4 - * * @author Bernhard Schussek <bschussek@gmail.com> * @group legacy */ diff --git a/Csrf/CsrfTokenManagerInterface.php b/Csrf/CsrfTokenManagerInterface.php index bccabe6..5936b64 100644 --- a/Csrf/CsrfTokenManagerInterface.php +++ b/Csrf/CsrfTokenManagerInterface.php @@ -14,8 +14,6 @@ namespace Symfony\Component\Security\Csrf; /** * Manages CSRF tokens. * - * @since 2.4 - * * @author Bernhard Schussek <bschussek@gmail.com> */ interface CsrfTokenManagerInterface diff --git a/Csrf/TokenGenerator/TokenGeneratorInterface.php b/Csrf/TokenGenerator/TokenGeneratorInterface.php index 1405b84..0ec2881 100644 --- a/Csrf/TokenGenerator/TokenGeneratorInterface.php +++ b/Csrf/TokenGenerator/TokenGeneratorInterface.php @@ -14,8 +14,6 @@ namespace Symfony\Component\Security\Csrf\TokenGenerator; /** * Generates CSRF tokens. * - * @since 2.4 - * * @author Bernhard Schussek <bschussek@gmail.com> */ interface TokenGeneratorInterface diff --git a/Csrf/TokenGenerator/UriSafeTokenGenerator.php b/Csrf/TokenGenerator/UriSafeTokenGenerator.php index fa5a722..432adf2 100644 --- a/Csrf/TokenGenerator/UriSafeTokenGenerator.php +++ b/Csrf/TokenGenerator/UriSafeTokenGenerator.php @@ -16,8 +16,6 @@ use Symfony\Component\Security\Core\Util\SecureRandomInterface; /** * Generates CSRF tokens. * - * @since 2.4 - * * @author Bernhard Schussek <bernhard.schussek@symfony.com> */ class UriSafeTokenGenerator implements TokenGeneratorInterface diff --git a/Csrf/TokenStorage/NativeSessionTokenStorage.php b/Csrf/TokenStorage/NativeSessionTokenStorage.php index 2620156..71151fa 100644 --- a/Csrf/TokenStorage/NativeSessionTokenStorage.php +++ b/Csrf/TokenStorage/NativeSessionTokenStorage.php @@ -16,8 +16,6 @@ use Symfony\Component\Security\Csrf\Exception\TokenNotFoundException; /** * Token storage that uses PHP's native session handling. * - * @since 2.4 - * * @author Bernhard Schussek <bschussek@gmail.com> */ class NativeSessionTokenStorage implements TokenStorageInterface diff --git a/Csrf/TokenStorage/SessionTokenStorage.php b/Csrf/TokenStorage/SessionTokenStorage.php index a6a6ea3..37b33e6 100644 --- a/Csrf/TokenStorage/SessionTokenStorage.php +++ b/Csrf/TokenStorage/SessionTokenStorage.php @@ -15,9 +15,7 @@ use Symfony\Component\HttpFoundation\Session\SessionInterface; use Symfony\Component\Security\Csrf\Exception\TokenNotFoundException; /** - * Token storage that uses a Symfony2 Session object. - * - * @since 2.4 + * Token storage that uses a Symfony Session object. * * @author Bernhard Schussek <bschussek@gmail.com> */ diff --git a/Csrf/TokenStorage/TokenStorageInterface.php b/Csrf/TokenStorage/TokenStorageInterface.php index 5efe72f..92386fb 100644 --- a/Csrf/TokenStorage/TokenStorageInterface.php +++ b/Csrf/TokenStorage/TokenStorageInterface.php @@ -14,8 +14,6 @@ namespace Symfony\Component\Security\Csrf\TokenStorage; /** * Stores CSRF tokens. * - * @since 2.4 - * * @author Bernhard Schussek <bschussek@gmail.com> */ interface TokenStorageInterface |