Merge remote-tracking branch 'origin/2.2' into 2.2

Author: weaverryan

reference/constraints/CardScheme.rst

@@ -54,6 +54,8 @@ on an  object that will contain a credit card number.
     .. code-block:: php-annotations
 
         // src/Acme/SubscriptionBundle/Entity/Transaction.php
+        namespace Acme\SubscriptionBundle\Entity\Transaction;
+        
         use Symfony\Component\Validator\Constraints as Assert;
 
         class Transaction
@@ -67,16 +69,18 @@ on an  object that will contain a credit card number.
     .. code-block:: php
 
         // src/Acme/SubscriptionBundle/Entity/Transaction.php
+        namespace Acme\SubscriptionBundle\Entity\Transaction;
+        
         use Symfony\Component\Validator\Mapping\ClassMetadata;
-        use Symfony\Component\Validator\Constraints\CardScheme;
+        use Symfony\Component\Validator\Constraints as Assert;
 
         class Transaction
         {
             protected $cardNumber;
 
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
-                $metadata->addPropertyConstraint('cardSchema', new CardScheme(array(
+                $metadata->addPropertyConstraint('cardNumber', new Assert\CardScheme(array(
                     'schemes' => array(
                         'VISA'
                     ),
@@ -117,4 +121,4 @@ message
 
 The message shown when the value does not pass the ``CardScheme`` check.
 
-.. _`Wikipedia: Issuer identification number (IIN)`: http://en.wikipedia.org/wiki/Bank_card_number#Issuer_identification_number_.28IIN.29
+.. _`Wikipedia: Issuer identification number (IIN)`: http://en.wikipedia.org/wiki/Bank_card_number#Issuer_identification_number_.28IIN.29

reference/constraints/Luhn.rst

@@ -1,5 +1,5 @@
 Luhn
-======
+====
 
 .. versionadded:: 2.2
     The Luhn validation is new in Symfony 2.2.
@@ -49,6 +49,8 @@ will contain a credit card number.
     .. code-block:: php-annotations
 
         // src/Acme/SubscriptionBundle/Entity/Transaction.php
+        namespace Acme\SubscriptionBundle\Entity\Transaction;
+        
         use Symfony\Component\Validator\Constraints as Assert;
 
         class Transaction
@@ -62,16 +64,18 @@ will contain a credit card number.
     .. code-block:: php
 
         // src/Acme/SubscriptionBundle/Entity/Transaction.php
+        namespace Acme\SubscriptionBundle\Entity\Transaction;
+        
         use Symfony\Component\Validator\Mapping\ClassMetadata;
-        use Symfony\Component\Validator\Constraints\Luhn;
+        use Symfony\Component\Validator\Constraints as Assert;
 
         class Transaction
         {
             protected $cardNumber;
 
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
-                $metadata->addPropertyConstraint('luhn', new Luhn(array(
+                $metadata->addPropertyConstraint('cardNumber', new Assert\Luhn(array(
                     'message' => 'Please check your credit card number',
                 )));
             }
@@ -87,4 +91,4 @@ message
 
 The default message supplied when the value does not pass the Luhn check.
 
-.. _`Luhn algorithm`: http://en.wikipedia.org/wiki/Luhn_algorithm
+.. _`Luhn algorithm`: http://en.wikipedia.org/wiki/Luhn_algorithm