merged branch schmittjoh/annotationUpdate (PR #1483)

Commits
-------

1cc1027 added @Annotation to UniqueEntity
ee22c5d added a note to update file
efcb435 updated to doctrine changes

Discussion
----------

updated to doctrine changes

---------------------------------------------------------------------------

by excelwebzone at 2011/06/30 06:29:23 -0700

Should also be implemented to the Route class and to all SensioFrameworkExtraBundle annotation classes

UPDATE.md

@@ -6,6 +6,11 @@ one. It only discusses changes that need to be done when using the "public"
 API of the framework. If you "hack" the core, you should probably follow the
 timeline closely anyway.
 
+RC3 to RC4
+----------
+* Annotation classes must be annotated with @Annotation 
+  (see the validator constraints for examples)
+
 beta5 to RC1
 ------------
 

src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php

@@ -18,6 +18,7 @@ use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 /**
  * Constraint for the Unique Entity validator
  *
+ * @Annotation
  * @author Benjamin Eberlei <kontakt@beberlei.de>
  */
 class UniqueEntity extends Constraint

src/Symfony/Component/Validator/Constraints/All.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class All extends Constraint
 {
     public $constraints = array();

src/Symfony/Component/Validator/Constraints/Blank.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class Blank extends Constraint
 {
     public $message = 'This value should be blank';

src/Symfony/Component/Validator/Constraints/Callback.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class Callback extends Constraint
 {
     public $methods;

src/Symfony/Component/Validator/Constraints/Choice.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class Choice extends Constraint
 {
     public $choices;

src/Symfony/Component/Validator/Constraints/Collection.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class Collection extends Constraint
 {
     public $fields;

src/Symfony/Component/Validator/Constraints/Country.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class Country extends Constraint
 {
     public $message = 'This value is not a valid country';

src/Symfony/Component/Validator/Constraints/Date.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class Date extends Constraint
 {
     public $message = 'This value is not a valid date';

src/Symfony/Component/Validator/Constraints/DateTime.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class DateTime extends Constraint
 {
     public $message = 'This value is not a valid datetime';

src/Symfony/Component/Validator/Constraints/Email.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class Email extends Constraint
 {
     public $message = 'This value is not a valid email address';

src/Symfony/Component/Validator/Constraints/False.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class False extends Constraint
 {
     public $message = 'This value should be false';

src/Symfony/Component/Validator/Constraints/File.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class File extends Constraint
 {
     public $maxSize = null;

src/Symfony/Component/Validator/Constraints/GroupSequence.php

@@ -14,6 +14,7 @@ namespace Symfony\Component\Validator\Constraints;
 /**
  * Annotation for group sequences
  *
+ * @Annotation
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  */
 class GroupSequence

src/Symfony/Component/Validator/Constraints/Image.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
+/** @Annotation */
 class Image extends File
 {
     public $mimeTypes = array(

src/Symfony/Component/Validator/Constraints/Ip.php

@@ -17,6 +17,7 @@ use Symfony\Component\Validator\Constraint;
 /**
  * Validates that a value is a valid IP address
  *
+ * @Annotation
  * @author Bernhard Schussek <bernhard.schussek@symfony.com>
  * @author Joseph Bielawski <stloyd@gmail.com>
  */

src/Symfony/Component/Validator/Constraints/Language.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class Language extends Constraint
 {
     public $message = 'This value is not a valid language';

src/Symfony/Component/Validator/Constraints/Locale.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class Locale extends Constraint
 {
     public $message = 'This value is not a valid locale';

src/Symfony/Component/Validator/Constraints/Max.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class Max extends Constraint
 {
     public $message = 'This value should be {{ limit }} or less';

src/Symfony/Component/Validator/Constraints/MaxLength.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class MaxLength extends Constraint
 {
     public $message = 'This value is too long. It should have {{ limit }} characters or less';

src/Symfony/Component/Validator/Constraints/Min.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class Min extends Constraint
 {
     public $message = 'This value should be {{ limit }} or more';

src/Symfony/Component/Validator/Constraints/MinLength.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class MinLength extends Constraint
 {
     public $message = 'This value is too short. It should have {{ limit }} characters or more';

src/Symfony/Component/Validator/Constraints/NotBlank.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class NotBlank extends Constraint
 {
     public $message = 'This value should not be blank';

src/Symfony/Component/Validator/Constraints/NotNull.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class NotNull extends Constraint
 {
     public $message = 'This value should not be null';

src/Symfony/Component/Validator/Constraints/Null.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class Null extends Constraint
 {
     public $message = 'This value should be null';

src/Symfony/Component/Validator/Constraints/Regex.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class Regex extends Constraint
 {
     public $message = 'This value is not valid';

src/Symfony/Component/Validator/Constraints/Time.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class Time extends Constraint
 {
     public $message = 'This value is not a valid time';

src/Symfony/Component/Validator/Constraints/True.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class True extends Constraint
 {
     public $message = 'This value should be true';

src/Symfony/Component/Validator/Constraints/Type.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class Type extends Constraint
 {
     public $message = 'This value should be of type {{ type }}';

src/Symfony/Component/Validator/Constraints/Url.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class Url extends Constraint
 {
     public $message = 'This value is not a valid URL';

src/Symfony/Component/Validator/Constraints/Valid.php

@@ -13,6 +13,7 @@ namespace Symfony\Component\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class Valid extends Constraint
 {
     public $traverse = true;

tests/Symfony/Tests/Component/Validator/Fixtures/ConstraintA.php

@@ -4,6 +4,7 @@ namespace Symfony\Tests\Component\Validator\Fixtures;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class ConstraintA extends Constraint
 {
     public $property1;

tests/Symfony/Tests/Component/Validator/Fixtures/ConstraintB.php

@@ -4,6 +4,7 @@ namespace Symfony\Tests\Component\Validator\Fixtures;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class ConstraintB extends Constraint {
 
     public function getTargets()

tests/Symfony/Tests/Component/Validator/Fixtures/ConstraintC.php

@@ -4,6 +4,7 @@ namespace Symfony\Tests\Component\Validator\Fixtures;
 
 use Symfony\Component\Validator\Constraint;
 
+/** @Annotation */
 class ConstraintC extends Constraint
 {
     public $option1;