Merge branch '2.5'

fabpot · fabpot · commit 459025283871 · 2014-05-31T04:03:04.000+02:00
* 2.5:
  [Validator] Remove property and method targets from the optional and required constraints.
  fixed CHANGELOG for 2.5
  bumped Symfony version to 2.5.0
  updated VERSION for 2.5.0-RC1
  updated CHANGELOG for 2.5.0-RC1
  [DomCrawler] Fixed charset detection in html5 meta charset tag
diff --git a/Constraints/Optional.php b/Constraints/Optional.php
@@ -13,7 +13,7 @@
 
 /**
  * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
+ * @Target({"ANNOTATION"})
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
diff --git a/Constraints/Required.php b/Constraints/Required.php
@@ -13,7 +13,7 @@
 
 /**
  * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
+ * @Target({"ANNOTATION"})
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* @Annotation`
`16`		`- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})`
	`16`	`+ * @Target({"ANNOTATION"})`
`17`	`17`	`*`
`18`	`18`	`* @author Bernhard Schussek <[email protected]>`
`19`	`19`	`*/`