diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-07-05 13:09:15 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-07-05 13:09:15 +0200 |
| commit | 59cd0be0c8bca0719147fa30d3cbc5e376560503 (patch) | |
| tree | a058ce21bf825a7ebf29ea0188b46f07a4d20ed4 | |
| parent | 4e06cf1b8ced0204d2b569caac39ce92c6e11717 (diff) | |
| parent | 6f72bc79990abf02dc7fe9792d6909c1ef333998 (diff) | |
| download | symfony-security-59cd0be0c8bca0719147fa30d3cbc5e376560503.zip symfony-security-59cd0be0c8bca0719147fa30d3cbc5e376560503.tar.gz symfony-security-59cd0be0c8bca0719147fa30d3cbc5e376560503.tar.bz2 | |
Merge branch '2.8' into 3.0
* 2.8:
[VarDumper] Fix indentation trimming in ExceptionCaster
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.
Conflicts:
src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidatorLegacyApiTest.php
src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfProviderAdapter.php
src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php
src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidatorLegacyApiTest.php
src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php
src/Symfony/Component/Validator/Constraints/UuidValidator.php
src/Symfony/Component/Validator/Context/LegacyExecutionContext.php
src/Symfony/Component/Validator/Context/LegacyExecutionContextFactory.php
src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php
src/Symfony/Component/Validator/Tests/Validator/AbstractLegacyApiTest.php
src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php
src/Symfony/Component/Validator/Validator/LegacyValidator.php
| -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 |
6 files changed, 1 insertions, 13 deletions
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 f331803..fb3f7e8 100644 --- a/Csrf/TokenGenerator/UriSafeTokenGenerator.php +++ b/Csrf/TokenGenerator/UriSafeTokenGenerator.php @@ -14,8 +14,6 @@ namespace Symfony\Component\Security\Csrf\TokenGenerator; /** * 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 a237b55..5ce2774 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 |