diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-23 16:08:54 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-23 16:08:54 +0200 |
| commit | bf15ba6fe71ae1040e209cee8a769672eb2e03bb (patch) | |
| tree | 7e05e7f215c443911714eebe94f75231a530cc47 | |
| parent | 3653a49d805f848c154faa8bbbd663670a5297ec (diff) | |
| parent | 51da92e1e61e4ab73e5de664e6f8e22c59147deb (diff) | |
| download | symfony-security-bf15ba6fe71ae1040e209cee8a769672eb2e03bb.zip symfony-security-bf15ba6fe71ae1040e209cee8a769672eb2e03bb.tar.gz symfony-security-bf15ba6fe71ae1040e209cee8a769672eb2e03bb.tar.bz2 | |
Merge branch '2.4'
* 2.4:
[Validator] added missing @Target
[Validator] fixed @Target config
added @Target annotations
[Process] Add missing docblocks, remove variable declarations
Conflicts:
src/Symfony/Component/Process/Process.php
src/Symfony/Component/Process/ProcessBuilder.php
| -rw-r--r-- | Core/Validator/Constraints/UserPassword.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Core/Validator/Constraints/UserPassword.php b/Core/Validator/Constraints/UserPassword.php index 76c4b3b..aee4cda 100644 --- a/Core/Validator/Constraints/UserPassword.php +++ b/Core/Validator/Constraints/UserPassword.php @@ -15,6 +15,7 @@ use Symfony\Component\Validator\Constraint; /** * @Annotation + * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) */ class UserPassword extends Constraint { |