Adapted documentation of Valid constraint to latest changes

Bernhard Schussek · fabpot · commit 0397541f437b · 2010-11-22T08:13:47.000+01:00
diff --git a/guides/validator/constraints/Valid.rst b/guides/validator/constraints/Valid.rst
@@ -1,20 +1,14 @@
 Valid
 =====
 
-Validates an associated object.
+Marks an associated object to be validated itself.
 
 .. code-block:: yaml
 
     properties:
         address:
             - Valid: ~
 
-Options
--------
-
-  * ``class``: The expected class of the object
-  * ``message``: The error message if the class doesn't match
-
 Example: Validate object graphs
 -------------------------------
 
@@ -89,15 +83,15 @@ their properties. Furthermore, ``Author`` stores an ``Address`` instance in the
     .. code-block:: php-annotations
 
         // Application/HelloBundle/Address.php
-        class Author
+        class Address
         {
             /**
              * @validation:NotBlank()
              */
             protected $street;
 
             /**
-             * @validation:NotBlank()
+             * @validation:NotBlank
              * @validation:MaxLength(5)
              */
             protected $zipCode;
@@ -107,15 +101,17 @@ their properties. Furthermore, ``Author`` stores an ``Address`` instance in the
         class Author
         {
             /**
-             * @validation:NotBlank()
+             * @validation:NotBlank
              * @validation:MinLength(4)
              */
             protected $firstName;
 
             /**
-             * @validation:NotBlank()
+             * @validation:NotBlank
              */
             protected $lastName;
+            
+            protected $address;
         }
 
     .. code-block:: php
@@ -124,7 +120,7 @@ their properties. Furthermore, ``Author`` stores an ``Address`` instance in the
         use Symfony\Components\Validator\Constraints\NotBlank;
         use Symfony\Components\Validator\Constraints\MaxLength;
         
-        class Author
+        class Address
         {
             protected $street;
 
@@ -148,6 +144,8 @@ their properties. Furthermore, ``Author`` stores an ``Address`` instance in the
 
             protected $lastName;
             
+            protected $address;
+            
             public static function loadMetadata(ClassMetadata $metadata)
             {
                 $metadata->addPropertyConstraint('firstName', new NotBlank());
@@ -184,8 +182,10 @@ invalid address. To prevent that, we add the ``Valid`` constraint to the
         // Application/HelloBundle/Author.php
         class Author
         {
+            /* ... */
+            
             /**
-             * @validation:Valid()
+             * @validation:Valid
              */
             protected $address;
         }
@@ -205,52 +205,8 @@ invalid address. To prevent that, we add the ``Valid`` constraint to the
             }
         }
 
-We can even go one step further and validate the class of the related object
-to be ``Address`` or one of its subclasses.
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        # Application/HelloBundle/Resources/config/validation.yml
-        Application\HelloBundle\Author:
-            properties:
-                address:
-                    - Valid: { class: Application\ḨelloBundle\Address }
-
-    .. code-block:: xml
-
-        <!-- Application/HelloBundle/Resources/config/validation.xml -->
-        <class name="Application\HelloBundle\Author">
-            <property name="address">
-                <constraint name="Valid">Application\HelloBundle\Address</constraint>
-            </property>
-        </class>
-
-    .. code-block:: php-annotations
-
-        // Application/HelloBundle/Author.php
-        class Author
-        {
-            /**
-             * @validation:Valid(class = "Application\HelloBundle\Address")
-             */
-            protected $address;
-        }
-
-    .. code-block:: php
+If you validate an author with an invalid address now, you can see that the
+validation of the ``Address`` fields failed.
 
-        // Application/HelloBundle/Author.php
-        use Symfony\Components\Validator\Constraints\Valid;
-        
-        class Author
-        {
-            protected $address;
-            
-            public static function loadMetadata(ClassMetadata $metadata)
-            {
-                $metadata->addPropertyConstraint('address', new Valid(array(
-                    'class' => 'Application\HelloBundle\Address',
-                )));
-            }
-        }
+    Application\HelloBundle\Author.address.zipCode:
+        This value is too long. It should have 5 characters or less
