Merge branch '2.4'

fabpot · fabpot · commit de6e3aa1362d · 2014-04-23T16:08:54.000+02:00
* 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
diff --git a/Validator/Constraints/UserPassword.php b/Validator/Constraints/UserPassword.php
@@ -15,6 +15,7 @@
 
 /**
  * @Annotation
+ * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
  */
 class UserPassword extends Constraint
 {

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* @Annotation`
	`18`	`+ * @Target({"PROPERTY", "METHOD", "ANNOTATION"})`
`18`	`19`	`*/`
`19`	`20`	`class UserPassword extends Constraint`
`20`	`21`	`{`