[symfony#1864] Removing a couple more references to duplicated constraints and marking them as deprecated

weaverryan · weaverryan · commit feb9b22a2b53 · 2012-11-16T06:51:55.000-06:00
diff --git a/reference/constraints/Collection.rst b/reference/constraints/Collection.rst
@@ -5,7 +5,7 @@ This constraint is used when the underlying data is a collection (i.e. an
 array or an object that implements ``Traversable`` and ``ArrayAccess``),
 but you'd like to validate different keys of that collection in different
 ways. For example, you might validate the ``email`` key using the ``Email``
-constraint and the ``inventory`` key of the collection with the ``Min`` constraint.
+constraint and the ``inventory`` key of the collection with the ``Range`` constraint.
 
 This constraint can also make sure that certain collection keys are present
 and that extra keys are not present.
diff --git a/reference/constraints/Max.rst b/reference/constraints/Max.rst
@@ -1,6 +1,12 @@
 Max
 ===
 
+.. caution::
+
+    The Max constraint is deprecated since version 2.1 and will be removed
+    in Symfony 2.3. Use :doc:`/reference/constraints/Range` with the ``max``
+    option instead.
+
 Validates that a given number is *less* than some maximum number.
 
 +----------------+--------------------------------------------------------------------+
diff --git a/reference/constraints/MaxLength.rst b/reference/constraints/MaxLength.rst
@@ -1,6 +1,12 @@
 MaxLength
 =========
 
+.. caution::
+
+    The MaxLength constraint is deprecated since version 2.1 and will be removed
+    in Symfony 2.3. Use :doc:`/reference/constraints/Length` with the ``max``
+    option instead.
+
 Validates that the length of a string is not larger than the given limit.
 
 +----------------+-------------------------------------------------------------------------+
diff --git a/reference/constraints/Min.rst b/reference/constraints/Min.rst
@@ -1,6 +1,12 @@
 Min
 ===
 
+.. caution::
+
+    The Min constraint is deprecated since version 2.1 and will be removed
+    in Symfony 2.3. Use :doc:`/reference/constraints/Range` with the ``min``
+    option instead.
+
 Validates that a given number is *greater* than some minimum number.
 
 +----------------+--------------------------------------------------------------------+
diff --git a/reference/constraints/MinLength.rst b/reference/constraints/MinLength.rst
@@ -1,6 +1,12 @@
 MinLength
 =========
 
+.. caution::
+
+    The MinLength constraint is deprecated since version 2.1 and will be removed
+    in Symfony 2.3. Use :doc:`/reference/constraints/Length` with the ``min``
+    option instead.
+
 Validates that the length of a string is at least as long as the given limit.
 
 +----------------+-------------------------------------------------------------------------+
diff --git a/reference/constraints/Valid.rst b/reference/constraints/Valid.rst
@@ -103,7 +103,7 @@ an ``Address`` instance in the ``$address`` property.
 
             /**
              * @Assert\NotBlank
-             * @Assert\MaxLength(max = "5")
+             * @Assert\Length(max = "5")
              */
             protected $zipCode;
         }

Original file line number	Diff line number	Diff line change
@@ -103,7 +103,7 @@ an ``Address`` instance in the ``$address`` property.
`103`	`103`
`104`	`104`	`/**`
`105`	`105`	`* @Assert\NotBlank`
`106`		`- * @Assert\MaxLength(max = "5")`
	`106`	`+ * @Assert\Length(max = "5")`
`107`	`107`	`*/`
`108`	`108`	`protected $zipCode;`
`109`	`109`	`}`