diff options
| author | Bernhard Schussek <bschussek@gmail.com> | 2014-09-25 17:49:37 +0200 |
|---|---|---|
| committer | Bernhard Schussek <bschussek@gmail.com> | 2014-09-25 17:49:37 +0200 |
| commit | 4f60b916829c93e32f9c086abdd50dbdec126afb (patch) | |
| tree | 3571903edaadf0dd686e52599ba4b6f1b824c4ef | |
| parent | 6f5a6ad3becc32eabfbe1129df3849e9913585c7 (diff) | |
| parent | a327d379c0fa22fe7e41e619ee71dd96ece41ae5 (diff) | |
| download | symfony-security-4f60b916829c93e32f9c086abdd50dbdec126afb.zip symfony-security-4f60b916829c93e32f9c086abdd50dbdec126afb.tar.gz symfony-security-4f60b916829c93e32f9c086abdd50dbdec126afb.tar.bz2 | |
Merge branch '2.5'
* 2.5:
[Validator] Added ConstraintValidator::buildViolation() helper for BC with 2.4 API
[Validator] Fixed LegacyValidator when only a constraint is validated
Conflicts:
src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
src/Symfony/Component/Validator/Constraints/RangeValidator.php
| -rw-r--r-- | Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php b/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php index 10f692c..ef93e25 100644 --- a/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php +++ b/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php @@ -92,7 +92,8 @@ class UserPasswordValidatorTest extends AbstractConstraintValidatorTest $this->validator->validate('secret', $constraint); - $this->assertViolation('myMessage'); + $this->buildViolation('myMessage') + ->assertRaised(); } /** |