Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit bf48c59

Browse filesBrowse files
committed
Merge branch '2.8' into 3.0
2 parents 7d922b9 + 63dd246 commit bf48c59
Copy full SHA for bf48c59

File tree

Expand file treeCollapse file tree

3 files changed

+13
-2
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+13
-2
lines changed

‎cookbook/security/api_key_authentication.rst

Copy file name to clipboardExpand all lines: cookbook/security/api_key_authentication.rst
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,11 @@ will cause authentication to fail. You might want to return ``null`` instead
128128
to just skip the authentication, so Symfony can fallback to another authentication
129129
method, if any.
130130

131+
.. caution::
132+
133+
In case you return ``null`` from your ``createToken()`` method, be sure to enable
134+
``anonymous`` in you firewall. This way you'll be able to get an ``AnonymousToken``.
135+
131136
2. supportsToken
132137
~~~~~~~~~~~~~~~~
133138

‎cookbook/service_container/shared.rst

Copy file name to clipboardExpand all lines: cookbook/service_container/shared.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ in your service definition:
3636
3737
.. code-block:: php
3838
39+
// app/config/services.php
3940
use Symfony\Component\DependencyInjection\Definition;
4041
41-
// app/config/services.php
4242
$definition = new Definition('...');
4343
$definition->setShared(false);
4444

‎reference/constraints/Valid.rst

Copy file name to clipboardExpand all lines: reference/constraints/Valid.rst
+7-1Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ an object and all sub-objects associated with it.
99
| Applies to | :ref:`property or method <validation-property-target>` |
1010
+----------------+---------------------------------------------------------------------+
1111
| Options | - `traverse`_ |
12-
| | - `deep`_ |
12+
| | - `deep`_ (deprecated as of 2.5) |
1313
| | - `payload`_ |
1414
+----------------+---------------------------------------------------------------------+
1515
| Class | :class:`Symfony\\Component\\Validator\\Constraints\\Valid` |
@@ -271,6 +271,12 @@ set to ``true``.
271271
deep
272272
~~~~
273273

274+
.. caution::
275+
276+
The ``deep`` option was deprecated in Symfony 2.5 and will be removed
277+
in Symfony 3.0. When traversing arrays, nested arrays are always traversed.
278+
When traversing nested objects, their traversal strategy is used.
279+
274280
**type**: ``boolean`` **default**: ``false``
275281

276282
If this constraint is applied to a property that holds an array of objects,

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.