This is the second-half of a fix for a bad merge (merged master into 2.1).

weaverryan · weaverryan · commit bd9ea955392c · 2012-10-06T22:29:59.000-05:00
This was fixed by reverting that merge on 2.1, merging 2.1 into master (as normal), then reverting the revert to restore the changes on master. Revert "This reverts an improper merge - master was merged into 2.1 by mistake." This reverts commit 3300ab3.
diff --git a/book/installation.rst b/book/installation.rst
@@ -60,11 +60,11 @@ Distribution:
 
 .. code-block:: bash
 
-    php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony 2.1.x-dev
+    php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony dev-master
 
 .. tip::
 
-    For an exact version, replace `2.1.x-dev` with the latest Symfony version
+    For an exact version, replace `dev-master` with the latest Symfony version
     (e.g. 2.1.1). For details, see the `Symfony Installation Page`_
 
 This command may take several minutes to run as Composer download the Standard
diff --git a/book/testing.rst b/book/testing.rst
@@ -415,13 +415,19 @@ HTTP layer. For a list of services available in your application, use the
 Accessing the Profiler Data
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-On each request, the Symfony profiler collects and stores a lot of data about
-the internal handling of that request. For example, the profiler could be
-used to verify that a given page executes less than a certain number of database
+On each request, you can enable the Symfony profiler to collect data about the
+internal handling of that request. For example, the profiler could be used to
+verify that a given page executes less than a certain number of database
 queries when loading.
 
 To get the Profiler for the last request, do the following::
 
+    // enable the profiler for the very next request
+    $client->enableProfiler();
+
+    $crawler = $client->request('GET', '/profiler');
+
+    // get the profile
     $profile = $client->getProfile();
 
 For specific details on using the profiler inside a test, see the
diff --git a/cookbook/testing/profiling.rst b/cookbook/testing/profiling.rst
@@ -11,15 +11,19 @@ various things and enforce some metrics.
 
 The Symfony2 :ref:`Profiler <internals-profiler>` gathers a lot of data for
 each request. Use this data to check the number of database calls, the time
-spent in the framework, ... But before writing assertions, always check that
-the profiler is indeed available (it is enabled by default in the ``test``
-environment)::
+spent in the framework, ... But before writing assertions, enable the profiler
+and check that the profiler is indeed available (it is enabled by default in
+the ``test`` environment)::
 
     class HelloControllerTest extends WebTestCase
     {
         public function testIndex()
         {
             $client = static::createClient();
+
+            // Enable the profiler for the next request (it does nothing if the profiler is not available)
+            $client->enableProfiler();
+
             $crawler = $client->request('GET', '/hello/Fabien');
 
             // ... write some assertions about the Response
diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst
@@ -59,12 +59,12 @@ have a ``Symfony/`` directory that looks like this:
 
     .. code-block:: bash
 
-        $ composer.phar create-project symfony/framework-standard-edition path/to/install 2.1.x-dev
+        $ composer.phar create-project symfony/framework-standard-edition path/to/install dev-master
 
         # remove the Git history
         $ rm -rf .git
     
-    For an exact version, replace `2.1.x-dev` with the latest Symfony version
+    For an exact version, replace `dev-master` with the latest Symfony version
     (e.g. 2.1.1). For details, see the `Symfony Installation Page`_
 
 .. tip::
diff --git a/reference/constraints.rst b/reference/constraints.rst
@@ -40,14 +40,16 @@ Validation Constraints Reference
    constraints/File
    constraints/Image
 
+   constraints/Luhn
+
    constraints/Callback
    constraints/All
    constraints/UserPassword
    constraints/Valid
 
 The Validator is designed to validate objects against *constraints*.
 In real life, a constraint could be: "The cake must not be burned". In
-Symfony2, constraints are similar: They are assertions that a condition is 
+Symfony2, constraints are similar: They are assertions that a condition is
 true.
 
 Supported Constraints
diff --git a/reference/constraints/Luhn.rst b/reference/constraints/Luhn.rst
@@ -0,0 +1,87 @@
+Luhn
+======
+
+This constraint is used to ensure that a credit card number passes the `Luhn algorithm`_.
+It is useful as a first step to validating a credit card: before communicating with a
+payment gateway.
+
++----------------+-----------------------------------------------------------------------+
+| Applies to     | :ref:`property or method<validation-property-target>`                 |
++----------------+-----------------------------------------------------------------------+
+| Options        | - `message`_                                                          |
++----------------+-----------------------------------------------------------------------+
+| Class          | :class:`Symfony\\Component\\Validator\\Constraints\\Luhn`             |
++----------------+-----------------------------------------------------------------------+
+| Validator      | :class:`Symfony\\Component\\Validator\\Constraints\\LuhnValidator`    |
++----------------+-----------------------------------------------------------------------+
+
+Basic Usage
+-----------
+
+To use the Luhn validator, simply apply it to a property on an object that
+will contain a credit card number.
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # src/Acme/SubscriptionBundle/Resources/config/validation.yml
+        Acme\SubscriptionBundle\Entity\Transaction:
+            properties:
+                cardNumber:
+                    - Luhn:
+                        message: Please check your credit card number.
+
+    .. code-block:: xml
+
+        <!-- src/Acme/SubscriptionBundle/Resources/config/validation.xml -->
+        <class name="Acme\SubscriptionBundle\Entity\Transaction">
+            <property name="cardNumber">
+                <constraint name="Luhn">
+                    <option name="message">Please check your credit card number.</option>
+                </constraint>
+            </property>
+        </class>
+
+    .. code-block:: php-annotations
+
+        // src/Acme/SubscriptionBundle/Entity/Transaction.php
+        use Symfony\Component\Validator\Constraints as Assert;
+
+        class Transaction
+        {
+            /**
+             * @Assert\Luhn(message = "Please check your credit card number.")
+             */
+            protected $cardNumber;
+        }
+
+    .. code-block:: php
+
+        // src/Acme/SubscriptionBundle/Entity/Transaction.php
+        use Symfony\Component\Validator\Mapping\ClassMetadata;
+        use Symfony\Component\Validator\Constraints\Luhn;
+
+        class Transaction
+        {
+            protected $cardNumber;
+
+            public static function loadValidatorMetadata(ClassMetadata $metadata)
+            {
+                $metadata->addPropertyConstraint('luhn', new Luhn(array(
+                    'message' => 'Please check your credit card number',
+                )));
+            }
+        }
+
+Available Options
+-----------------
+
+message
+~~~~~~~
+
+**type**: ``string`` **default**: ``Invalid card number``
+
+The default message supplied when the value does not pass the Luhn check.
+
+.. _`Luhn algorithm`: http://en.wikipedia.org/wiki/Luhn_algorithm
diff --git a/reference/constraints/map.rst.inc b/reference/constraints/map.rst.inc
@@ -54,6 +54,11 @@ File Constraints
 * :doc:`File </reference/constraints/File>`
 * :doc:`Image </reference/constraints/Image>`
 
+Financial Constraints
+~~~~~~~~~~~~~~~~~~~~~
+
+* :doc:`Luhn </reference/constraints/Luhn>`
+
 Other Constraints
 ~~~~~~~~~~~~~~~~~
 
