Merge branch '2.7' into 2.8

xabbuh · xabbuh · commit 63dd246f4a3d · 2015-12-09T20:37:10.000+01:00
diff --git a/cookbook/security/api_key_authentication.rst b/cookbook/security/api_key_authentication.rst
@@ -128,6 +128,11 @@ will cause authentication to fail. You might want to return ``null`` instead
 to just skip the authentication, so Symfony can fallback to another authentication
 method, if any.
 
+.. caution::
+
+    In case you return ``null`` from your ``createToken()`` method, be sure to enable
+    ``anonymous`` in you firewall. This way you'll be able to get an ``AnonymousToken``.
+
 2. supportsToken
 ~~~~~~~~~~~~~~~~
 
diff --git a/reference/constraints/Valid.rst b/reference/constraints/Valid.rst
@@ -9,7 +9,7 @@ an object and all sub-objects associated with it.
 | Applies to     | :ref:`property or method <validation-property-target>`              |
 +----------------+---------------------------------------------------------------------+
 | Options        | - `traverse`_                                                       |
-|                | - `deep`_                                                           |
+|                | - `deep`_ (deprecated as of 2.5)                                    |
 |                | - `payload`_                                                        |
 +----------------+---------------------------------------------------------------------+
 | Class          | :class:`Symfony\\Component\\Validator\\Constraints\\Valid`          |
@@ -271,6 +271,12 @@ set to ``true``.
 deep
 ~~~~
 
+.. caution::
+
+    The ``deep`` option was deprecated in Symfony 2.5 and will be removed
+    in Symfony 3.0. When traversing arrays, nested arrays are always traversed.
+    When traversing nested objects, their traversal strategy is used.
+
 **type**: ``boolean`` **default**: ``false``
 
 If this constraint is applied to a property that holds an array of objects,
