diff --git a/UPGRADE-2.6.md b/UPGRADE-2.6.md index 288d3ecad8c11..3114d65b593b2 100644 --- a/UPGRADE-2.6.md +++ b/UPGRADE-2.6.md @@ -77,6 +77,43 @@ Validator ``` value == null or (YOUR_EXPRESSION) ``` + + * The basic comparison constraints were deprecated and will be removed in + Symfony 3.0: + + * `AbstractComparison` and `AbstractComparisonValidator` + * `Blank` and `BlankValidator` + * `EqualTo` and `EqualToValidator` + * `False` and `FalseValidator` + * `GreaterThan` and `GreaterThanValidator` + * `GreaterThanOrEqual` and `GreaterThanOrEqualValidator` + * `IdenticalTo` and `IdenticalToValidator` + * `LessThan` and `LessThanValidator` + * `LessThanOrEqual` and `LessThanOrEqualValidator` + * `NotEqualTo` and `NotEqualToValidator` + * `NotIdenticalTo` and `NotIdenticalToValidator` + * `Null` and `NullValidator` + * `True` and `TrueValidator` + + You should use the `Expression` constraint instead. + + Before: + + ```php + /** + * @GreaterThan(0, message="Please enter a positive number.") + */ + private $age; + ``` + + After: + + ```php + /** + * @Expression("value > 0", message="Please enter a positive number.") + */ + private $age; + ``` Security -------- diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md index 329eaf3eb0aed..b3e0cffe75482 100644 --- a/src/Symfony/Component/Validator/CHANGELOG.md +++ b/src/Symfony/Component/Validator/CHANGELOG.md @@ -15,6 +15,19 @@ CHANGELOG * [BC BREAK] added `Mapping\MetadataInterface::getConstraints()` * added generic "payload" option to all constraints for attaching domain-specific data * [BC BREAK] added `ConstraintViolationBuilderInterface::setCause()` + * deprecated `AbstractComparison` and `AbstractComparisonValidator` + * deprecated `Blank` and `BlankValidator` + * deprecated `EqualTo` and `EqualToValidator` + * deprecated `False` and `FalseValidator` + * deprecated `GreaterThan` and `GreaterThanValidator` + * deprecated `GreaterThanOrEqual` and `GreaterThanOrEqualValidator` + * deprecated `IdenticalTo` and `IdenticalToValidator` + * deprecated `LessThan` and `LessThanValidator` + * deprecated `LessThanOrEqual` and `LessThanOrEqualValidator` + * deprecated `NotEqualTo` and `NotEqualToValidator` + * deprecated `NotIdenticalTo` and `NotIdenticalToValidator` + * deprecated `Null` and `NullValidator` + * deprecated `True` and `TrueValidator` 2.5.0 ----- diff --git a/src/Symfony/Component/Validator/Constraints/AbstractComparison.php b/src/Symfony/Component/Validator/Constraints/AbstractComparison.php index fb1f1f3ef7c75..91cc53442f25a 100644 --- a/src/Symfony/Component/Validator/Constraints/AbstractComparison.php +++ b/src/Symfony/Component/Validator/Constraints/AbstractComparison.php @@ -18,6 +18,9 @@ * Used for the comparison of values. * * @author Daniel Holmes + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ abstract class AbstractComparison extends Constraint { diff --git a/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php b/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php index 1aa13c8978444..2ae224a3a4835 100644 --- a/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php +++ b/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php @@ -20,6 +20,9 @@ * * @author Daniel Holmes * @author Bernhard Schussek + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ abstract class AbstractComparisonValidator extends ConstraintValidator { diff --git a/src/Symfony/Component/Validator/Constraints/Blank.php b/src/Symfony/Component/Validator/Constraints/Blank.php index 766ce6c7bbbec..3b5df35a4553c 100644 --- a/src/Symfony/Component/Validator/Constraints/Blank.php +++ b/src/Symfony/Component/Validator/Constraints/Blank.php @@ -20,6 +20,9 @@ * @author Bernhard Schussek * * @api + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class Blank extends Constraint { diff --git a/src/Symfony/Component/Validator/Constraints/BlankValidator.php b/src/Symfony/Component/Validator/Constraints/BlankValidator.php index 031c7a581cd3a..ffff81d7d7e11 100644 --- a/src/Symfony/Component/Validator/Constraints/BlankValidator.php +++ b/src/Symfony/Component/Validator/Constraints/BlankValidator.php @@ -19,6 +19,9 @@ * @author Bernhard Schussek * * @api + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class BlankValidator extends ConstraintValidator { diff --git a/src/Symfony/Component/Validator/Constraints/EqualTo.php b/src/Symfony/Component/Validator/Constraints/EqualTo.php index 8d3d7524ddf91..4b21908d35ebc 100644 --- a/src/Symfony/Component/Validator/Constraints/EqualTo.php +++ b/src/Symfony/Component/Validator/Constraints/EqualTo.php @@ -16,6 +16,9 @@ * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) * * @author Daniel Holmes + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class EqualTo extends AbstractComparison { diff --git a/src/Symfony/Component/Validator/Constraints/EqualToValidator.php b/src/Symfony/Component/Validator/Constraints/EqualToValidator.php index 3739dbebfe7a5..20aa6047ee60b 100644 --- a/src/Symfony/Component/Validator/Constraints/EqualToValidator.php +++ b/src/Symfony/Component/Validator/Constraints/EqualToValidator.php @@ -15,6 +15,9 @@ * Validates values are equal (==). * * @author Daniel Holmes + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class EqualToValidator extends AbstractComparisonValidator { diff --git a/src/Symfony/Component/Validator/Constraints/False.php b/src/Symfony/Component/Validator/Constraints/False.php index fc2e3e49cbd25..70e900c242bd6 100644 --- a/src/Symfony/Component/Validator/Constraints/False.php +++ b/src/Symfony/Component/Validator/Constraints/False.php @@ -20,6 +20,9 @@ * @author Bernhard Schussek * * @api + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class False extends Constraint { diff --git a/src/Symfony/Component/Validator/Constraints/FalseValidator.php b/src/Symfony/Component/Validator/Constraints/FalseValidator.php index 206780cefc73c..3bfc716250e1d 100644 --- a/src/Symfony/Component/Validator/Constraints/FalseValidator.php +++ b/src/Symfony/Component/Validator/Constraints/FalseValidator.php @@ -19,6 +19,9 @@ * @author Bernhard Schussek * * @api + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class FalseValidator extends ConstraintValidator { diff --git a/src/Symfony/Component/Validator/Constraints/GreaterThan.php b/src/Symfony/Component/Validator/Constraints/GreaterThan.php index ec7fafb3a4cd6..c5985fcb85d94 100644 --- a/src/Symfony/Component/Validator/Constraints/GreaterThan.php +++ b/src/Symfony/Component/Validator/Constraints/GreaterThan.php @@ -16,6 +16,9 @@ * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) * * @author Daniel Holmes + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class GreaterThan extends AbstractComparison { diff --git a/src/Symfony/Component/Validator/Constraints/GreaterThanOrEqual.php b/src/Symfony/Component/Validator/Constraints/GreaterThanOrEqual.php index 36fdd9c0975d2..0f7f38f111865 100644 --- a/src/Symfony/Component/Validator/Constraints/GreaterThanOrEqual.php +++ b/src/Symfony/Component/Validator/Constraints/GreaterThanOrEqual.php @@ -16,6 +16,9 @@ * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) * * @author Daniel Holmes + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class GreaterThanOrEqual extends AbstractComparison { diff --git a/src/Symfony/Component/Validator/Constraints/GreaterThanOrEqualValidator.php b/src/Symfony/Component/Validator/Constraints/GreaterThanOrEqualValidator.php index 2363204174642..e860fb659141e 100644 --- a/src/Symfony/Component/Validator/Constraints/GreaterThanOrEqualValidator.php +++ b/src/Symfony/Component/Validator/Constraints/GreaterThanOrEqualValidator.php @@ -15,6 +15,9 @@ * Validates values are greater than or equal to the previous (>=). * * @author Daniel Holmes + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class GreaterThanOrEqualValidator extends AbstractComparisonValidator { diff --git a/src/Symfony/Component/Validator/Constraints/GreaterThanValidator.php b/src/Symfony/Component/Validator/Constraints/GreaterThanValidator.php index fdcf0c1f94f6c..3d9ddf3cfdfa2 100644 --- a/src/Symfony/Component/Validator/Constraints/GreaterThanValidator.php +++ b/src/Symfony/Component/Validator/Constraints/GreaterThanValidator.php @@ -15,6 +15,9 @@ * Validates values are greater than the previous (>). * * @author Daniel Holmes + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class GreaterThanValidator extends AbstractComparisonValidator { diff --git a/src/Symfony/Component/Validator/Constraints/IdenticalTo.php b/src/Symfony/Component/Validator/Constraints/IdenticalTo.php index 6d00286d23d6a..a3cdf219c7c68 100644 --- a/src/Symfony/Component/Validator/Constraints/IdenticalTo.php +++ b/src/Symfony/Component/Validator/Constraints/IdenticalTo.php @@ -16,6 +16,9 @@ * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) * * @author Daniel Holmes + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class IdenticalTo extends AbstractComparison { diff --git a/src/Symfony/Component/Validator/Constraints/IdenticalToValidator.php b/src/Symfony/Component/Validator/Constraints/IdenticalToValidator.php index a1867262aa304..84e1cc0fd3b6c 100644 --- a/src/Symfony/Component/Validator/Constraints/IdenticalToValidator.php +++ b/src/Symfony/Component/Validator/Constraints/IdenticalToValidator.php @@ -15,6 +15,9 @@ * Validates values are identical (===). * * @author Daniel Holmes + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class IdenticalToValidator extends AbstractComparisonValidator { diff --git a/src/Symfony/Component/Validator/Constraints/LessThan.php b/src/Symfony/Component/Validator/Constraints/LessThan.php index b116320037d5d..be1b9055c42f1 100644 --- a/src/Symfony/Component/Validator/Constraints/LessThan.php +++ b/src/Symfony/Component/Validator/Constraints/LessThan.php @@ -16,6 +16,9 @@ * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) * * @author Daniel Holmes + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class LessThan extends AbstractComparison { diff --git a/src/Symfony/Component/Validator/Constraints/LessThanOrEqual.php b/src/Symfony/Component/Validator/Constraints/LessThanOrEqual.php index 7faca842215f9..e6721457365aa 100644 --- a/src/Symfony/Component/Validator/Constraints/LessThanOrEqual.php +++ b/src/Symfony/Component/Validator/Constraints/LessThanOrEqual.php @@ -16,6 +16,9 @@ * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) * * @author Daniel Holmes + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class LessThanOrEqual extends AbstractComparison { diff --git a/src/Symfony/Component/Validator/Constraints/LessThanOrEqualValidator.php b/src/Symfony/Component/Validator/Constraints/LessThanOrEqualValidator.php index dcc93b2503792..9779d1800226f 100644 --- a/src/Symfony/Component/Validator/Constraints/LessThanOrEqualValidator.php +++ b/src/Symfony/Component/Validator/Constraints/LessThanOrEqualValidator.php @@ -15,6 +15,9 @@ * Validates values are less than or equal to the previous (<=). * * @author Daniel Holmes + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class LessThanOrEqualValidator extends AbstractComparisonValidator { diff --git a/src/Symfony/Component/Validator/Constraints/LessThanValidator.php b/src/Symfony/Component/Validator/Constraints/LessThanValidator.php index 081316a588c90..1426ededbc7da 100644 --- a/src/Symfony/Component/Validator/Constraints/LessThanValidator.php +++ b/src/Symfony/Component/Validator/Constraints/LessThanValidator.php @@ -15,6 +15,9 @@ * Validates values are less than the previous (<). * * @author Daniel Holmes + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class LessThanValidator extends AbstractComparisonValidator { diff --git a/src/Symfony/Component/Validator/Constraints/NotEqualTo.php b/src/Symfony/Component/Validator/Constraints/NotEqualTo.php index abd80920fb3b4..1ce0b87219fd0 100644 --- a/src/Symfony/Component/Validator/Constraints/NotEqualTo.php +++ b/src/Symfony/Component/Validator/Constraints/NotEqualTo.php @@ -16,6 +16,9 @@ * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) * * @author Daniel Holmes + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class NotEqualTo extends AbstractComparison { diff --git a/src/Symfony/Component/Validator/Constraints/NotEqualToValidator.php b/src/Symfony/Component/Validator/Constraints/NotEqualToValidator.php index 5710a85b93790..9985720970b04 100644 --- a/src/Symfony/Component/Validator/Constraints/NotEqualToValidator.php +++ b/src/Symfony/Component/Validator/Constraints/NotEqualToValidator.php @@ -15,6 +15,9 @@ * Validates values are all unequal (!=). * * @author Daniel Holmes + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class NotEqualToValidator extends AbstractComparisonValidator { diff --git a/src/Symfony/Component/Validator/Constraints/NotIdenticalTo.php b/src/Symfony/Component/Validator/Constraints/NotIdenticalTo.php index fb4ef3f3c1836..e2f78fd32babb 100644 --- a/src/Symfony/Component/Validator/Constraints/NotIdenticalTo.php +++ b/src/Symfony/Component/Validator/Constraints/NotIdenticalTo.php @@ -16,6 +16,9 @@ * @Target({"PROPERTY", "METHOD", "ANNOTATION"}) * * @author Daniel Holmes + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class NotIdenticalTo extends AbstractComparison { diff --git a/src/Symfony/Component/Validator/Constraints/NotIdenticalToValidator.php b/src/Symfony/Component/Validator/Constraints/NotIdenticalToValidator.php index ed8dc1c0dd3fc..18d734ca04822 100644 --- a/src/Symfony/Component/Validator/Constraints/NotIdenticalToValidator.php +++ b/src/Symfony/Component/Validator/Constraints/NotIdenticalToValidator.php @@ -15,6 +15,9 @@ * Validates values aren't identical (!==). * * @author Daniel Holmes + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class NotIdenticalToValidator extends AbstractComparisonValidator { diff --git a/src/Symfony/Component/Validator/Constraints/Null.php b/src/Symfony/Component/Validator/Constraints/Null.php index 310455021bce6..b5b009bf9a020 100644 --- a/src/Symfony/Component/Validator/Constraints/Null.php +++ b/src/Symfony/Component/Validator/Constraints/Null.php @@ -20,6 +20,9 @@ * @author Bernhard Schussek * * @api + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class Null extends Constraint { diff --git a/src/Symfony/Component/Validator/Constraints/NullValidator.php b/src/Symfony/Component/Validator/Constraints/NullValidator.php index 1e6c3a53897ab..38656fb359a92 100644 --- a/src/Symfony/Component/Validator/Constraints/NullValidator.php +++ b/src/Symfony/Component/Validator/Constraints/NullValidator.php @@ -19,6 +19,9 @@ * @author Bernhard Schussek * * @api + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class NullValidator extends ConstraintValidator { diff --git a/src/Symfony/Component/Validator/Constraints/True.php b/src/Symfony/Component/Validator/Constraints/True.php index 788e36a9ee2aa..d88ca2e5c2219 100644 --- a/src/Symfony/Component/Validator/Constraints/True.php +++ b/src/Symfony/Component/Validator/Constraints/True.php @@ -20,6 +20,9 @@ * @author Bernhard Schussek * * @api + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class True extends Constraint { diff --git a/src/Symfony/Component/Validator/Constraints/TrueValidator.php b/src/Symfony/Component/Validator/Constraints/TrueValidator.php index a01f5bb37deda..685a06a8e899f 100644 --- a/src/Symfony/Component/Validator/Constraints/TrueValidator.php +++ b/src/Symfony/Component/Validator/Constraints/TrueValidator.php @@ -19,6 +19,9 @@ * @author Bernhard Schussek * * @api + * + * @deprecated Deprecated as of Symfony 2.6, to be removed in version 3.0. + * Use {@link Expression} instead. */ class TrueValidator extends ConstraintValidator {