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 /Core/Encoder | |
| 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
Diffstat (limited to 'Core/Encoder')
0 files changed, 0 insertions, 0 deletions