symfony · weaverryan · Apr 15, 2015 · Mar 8, 2015
diff --git a/book/forms.rst b/book/forms.rst
@@ -344,17 +344,6 @@ object.
 
 .. configuration-block::
 
-    .. code-block:: yaml
-
-        # AppBundle/Resources/config/validation.yml
-        AppBundle\Entity\Task:
-            properties:
-                task:
-                    - NotBlank: ~
-                dueDate:
-                    - NotBlank: ~
-                    - Type: \DateTime
-
     .. code-block:: php-annotations
 
         // AppBundle/Entity/Task.php
@@ -374,6 +363,17 @@ object.
             protected $dueDate;
         }
 
+    .. code-block:: yaml
+
+        # AppBundle/Resources/config/validation.yml
+        AppBundle\Entity\Task:
+            properties:
+                task:
+                    - NotBlank: ~
+                dueDate:
+                    - NotBlank: ~
+                    - Type: \DateTime
+
     .. code-block:: xml
 
         <!-- AppBundle/Resources/config/validation.xml -->

diff --git a/cookbook/doctrine/file_uploads.rst b/cookbook/doctrine/file_uploads.rst
@@ -152,15 +152,6 @@ rules::
 
 .. configuration-block::
 
-    .. code-block:: yaml
-
-        # src/AppBundle/Resources/config/validation.yml
-        AppBundle\Entity\Document:
-            properties:
-                file:
-                    - File:
-                        maxSize: 6000000
-
     .. code-block:: php-annotations
 
         // src/AppBundle/Entity/Document.php
@@ -179,6 +170,15 @@ rules::
             // ...
         }
 
+    .. code-block:: yaml
+
+        # src/AppBundle/Resources/config/validation.yml
+        AppBundle\Entity\Document:
+            properties:
+                file:
+                    - File:
+                        maxSize: 6000000
+
     .. code-block:: xml
 
         <!-- src/AppBundle/Resources/config/validation.xml -->

diff --git a/cookbook/validation/custom_constraint.rst b/cookbook/validation/custom_constraint.rst
@@ -89,15 +89,6 @@ Using custom validators is very easy, just as the ones provided by Symfony itsel
 
 .. configuration-block::
 
-    .. code-block:: yaml
-
-        # src/AppBundle/Resources/config/validation.yml
-        AppBundle\Entity\AcmeEntity:
-            properties:
-                name:
-                    - NotBlank: ~
-                    - AppBundle\Validator\Constraints\ContainsAlphanumeric: ~
-
     .. code-block:: php-annotations
 
         // src/AppBundle/Entity/AcmeEntity.php
@@ -117,6 +108,15 @@ Using custom validators is very easy, just as the ones provided by Symfony itsel
             // ...
         }
 
+    .. code-block:: yaml
+
+        # src/AppBundle/Resources/config/validation.yml
+        AppBundle\Entity\AcmeEntity:
+            properties:
+                name:
+                    - NotBlank: ~
+                    - AppBundle\Validator\Constraints\ContainsAlphanumeric: ~
+
     .. code-block:: xml
 
         <!-- src/AppBundle/Resources/config/validation.xml -->
@@ -237,13 +237,6 @@ not to the property:
 
 .. configuration-block::
 
-    .. code-block:: yaml
-
-        # src/AppBundle/Resources/config/validation.yml
-        AppBundle\Entity\AcmeEntity:
-            constraints:
-                - AppBundle\Validator\Constraints\ContainsAlphanumeric: ~
-
     .. code-block:: php-annotations
 
         /**
@@ -254,6 +247,13 @@ not to the property:
             // ...
         }
 
+    .. code-block:: yaml
+
+        # src/AppBundle/Resources/config/validation.yml
+        AppBundle\Entity\AcmeEntity:
+            constraints:
+                - AppBundle\Validator\Constraints\ContainsAlphanumeric: ~
+
     .. code-block:: xml
 
         <!-- src/AppBundle/Resources/config/validation.xml -->

diff --git a/reference/constraints/All.rst b/reference/constraints/All.rst
@@ -22,17 +22,6 @@ entry in that array:
 
 .. configuration-block::
 
-    .. code-block:: yaml
-
-        # src/Acme/UserBundle/Resources/config/validation.yml
-        Acme\UserBundle\Entity\User:
-            properties:
-                favoriteColors:
-                    - All:
-                        - NotBlank:  ~
-                        - Length:
-                            min: 5
-
     .. code-block:: php-annotations
 
         // src/Acme/UserBundle/Entity/User.php
@@ -51,6 +40,17 @@ entry in that array:
              protected $favoriteColors = array();
         }
 
+    .. code-block:: yaml
+
+        # src/Acme/UserBundle/Resources/config/validation.yml
+        Acme\UserBundle\Entity\User:
+            properties:
+                favoriteColors:
+                    - All:
+                        - NotBlank:  ~
+                        - Length:
+                            min: 5
+
     .. code-block:: xml
 
         <!-- src/Acme/UserBundle/Resources/config/validation.xml -->

diff --git a/reference/constraints/Blank.rst b/reference/constraints/Blank.rst
@@ -24,14 +24,6 @@ of an ``Author`` class were blank, you could do the following:
 
 .. configuration-block::
 
-    .. code-block:: yaml
-
-        # src/Acme/BlogBundle/Resources/config/validation.yml
-        Acme\BlogBundle\Entity\Author:
-            properties:
-                firstName:
-                    - Blank: ~
-
     .. code-block:: php-annotations
 
         // src/Acme/BlogBundle/Entity/Author.php
@@ -47,6 +39,14 @@ of an ``Author`` class were blank, you could do the following:
             protected $firstName;
         }
 
+    .. code-block:: yaml
+
+        # src/Acme/BlogBundle/Resources/config/validation.yml
+        Acme\BlogBundle\Entity\Author:
+            properties:
+                firstName:
+                    - Blank: ~
+
     .. code-block:: xml
 
         <!-- src/Acme/BlogBundle/Resources/config/validation.xml -->

diff --git a/reference/constraints/Callback.rst b/reference/constraints/Callback.rst
@@ -32,14 +32,6 @@ Setup
 
 .. configuration-block::
 
-    .. code-block:: yaml
-
-        # src/Acme/BlogBundle/Resources/config/validation.yml
-        Acme\BlogBundle\Entity\Author:
-            constraints:
-                - Callback:
-                    methods:   [isAuthorValid]
-
     .. code-block:: php-annotations
 
         // src/Acme/BlogBundle/Entity/Author.php
@@ -54,6 +46,14 @@ Setup
         {
         }
 
+    .. code-block:: yaml
+
+        # src/Acme/BlogBundle/Resources/config/validation.yml
+        Acme\BlogBundle\Entity\Author:
+            constraints:
+                - Callback:
+                    methods:   [isAuthorValid]
+
     .. code-block:: xml
 
         <!-- src/Acme/BlogBundle/Resources/config/validation.xml -->
@@ -139,15 +139,6 @@ process. Each method can be one of the following formats:
 
     .. configuration-block::
 
-        .. code-block:: yaml
-
-            # src/Acme/BlogBundle/Resources/config/validation.yml
-            Acme\BlogBundle\Entity\Author:
-                constraints:
-                    - Callback:
-                        methods:
-                            -    [Acme\BlogBundle\MyStaticValidatorClass, isAuthorValid]
-
         .. code-block:: php-annotations
 
             // src/Acme/BlogBundle/Entity/Author.php
@@ -162,6 +153,15 @@ process. Each method can be one of the following formats:
             {
             }
 
+        .. code-block:: yaml
+
+            # src/Acme/BlogBundle/Resources/config/validation.yml
+            Acme\BlogBundle\Entity\Author:
+                constraints:
+                    - Callback:
+                        methods:
+                            -    [Acme\BlogBundle\MyStaticValidatorClass, isAuthorValid]
+
         .. code-block:: xml
 
             <!-- src/Acme/BlogBundle/Resources/config/validation.xml -->

diff --git a/reference/constraints/CardScheme.rst b/reference/constraints/CardScheme.rst
@@ -27,6 +27,21 @@ on an object that will contain a credit card number.
 
 .. configuration-block::
 
+    .. code-block:: php-annotations
+
+        // src/Acme/SubscriptionBundle/Entity/Transaction.php
+        namespace Acme\SubscriptionBundle\Entity\Transaction;
+
+        use Symfony\Component\Validator\Constraints as Assert;
+
+        class Transaction
+        {
+            /**
+             * @Assert\CardScheme(schemes = {"VISA"}, message = "Your credit card number is invalid.")
+             */
+            protected $cardNumber;
+        }
+
     .. code-block:: yaml
 
         # src/Acme/SubscriptionBundle/Resources/config/validation.yml
@@ -57,21 +72,6 @@ on an object that will contain a credit card number.
             </class>
         </constraint-mapping>
 
-    .. code-block:: php-annotations
-
-        // src/Acme/SubscriptionBundle/Entity/Transaction.php
-        namespace Acme\SubscriptionBundle\Entity\Transaction;
-
-        use Symfony\Component\Validator\Constraints as Assert;
-
-        class Transaction
-        {
-            /**
-             * @Assert\CardScheme(schemes = {"VISA"}, message = "Your credit card number is invalid.")
-             */
-            protected $cardNumber;
-        }
-
     .. code-block:: php
 
         // src/Acme/SubscriptionBundle/Entity/Transaction.php

diff --git a/reference/constraints/Choice.rst b/reference/constraints/Choice.rst
@@ -36,16 +36,6 @@ If your valid choice list is simple, you can pass them in directly via the
 
 .. configuration-block::
 
-    .. code-block:: yaml
-
-        # src/Acme/BlogBundle/Resources/config/validation.yml
-        Acme\BlogBundle\Entity\Author:
-            properties:
-                gender:
-                    - Choice:
-                        choices:  [male, female]
-                        message:  Choose a valid gender.
-
     .. code-block:: php-annotations
 
         // src/Acme/BlogBundle/Entity/Author.php
@@ -61,6 +51,16 @@ If your valid choice list is simple, you can pass them in directly via the
             protected $gender;
         }
 
+    .. code-block:: yaml
+
+        # src/Acme/BlogBundle/Resources/config/validation.yml
+        Acme\BlogBundle\Entity\Author:
+            properties:
+                gender:
+                    - Choice:
+                        choices:  [male, female]
+                        message:  Choose a valid gender.
+
     .. code-block:: xml
 
         <!-- src/Acme/BlogBundle/Resources/config/validation.xml -->
@@ -129,14 +129,6 @@ constraint.
 
 .. configuration-block::
 
-    .. code-block:: yaml
-
-        # src/Acme/BlogBundle/Resources/config/validation.yml
-        Acme\BlogBundle\Entity\Author:
-            properties:
-                gender:
-                    - Choice: { callback: getGenders }
-
     .. code-block:: php-annotations
 
         // src/Acme/BlogBundle/Entity/Author.php
@@ -152,6 +144,14 @@ constraint.
             protected $gender;
         }
 
+    .. code-block:: yaml
+
+        # src/Acme/BlogBundle/Resources/config/validation.yml
+        Acme\BlogBundle\Entity\Author:
+            properties:
+                gender:
+                    - Choice: { callback: getGenders }
+
     .. code-block:: xml
 
         <!-- src/Acme/BlogBundle/Resources/config/validation.xml -->
@@ -194,14 +194,6 @@ you can pass the class name and the method as an array.
 
 .. configuration-block::
 
-    .. code-block:: yaml
-
-        # src/Acme/BlogBundle/Resources/config/validation.yml
-        Acme\BlogBundle\Entity\Author:
-            properties:
-                gender:
-                    - Choice: { callback: [Util, getGenders] }
-
     .. code-block:: php-annotations
 
         // src/Acme/BlogBundle/Entity/Author.php
@@ -217,6 +209,14 @@ you can pass the class name and the method as an array.
             protected $gender;
         }
 
+    .. code-block:: yaml
+
+        # src/Acme/BlogBundle/Resources/config/validation.yml
+        Acme\BlogBundle\Entity\Author:
+            properties:
+                gender:
+                    - Choice: { callback: [Util, getGenders] }
+
     .. code-block:: xml
 
         <!-- src/Acme/BlogBundle/Resources/config/validation.xml -->