Commitbf48c59

committed

Merge branch '2.8' into 3.0

2 parents7d922b9 +63dd246 commitbf48c59Copy full SHA for bf48c59

File tree

+13

-2

lines changed

cookbook
- security
  - api_key_authentication.rst
- service_container
  - shared.rst
reference/constraints
- Valid.rst

+13

-2

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -128,6 +128,11 @@ will cause authentication to fail. You might want to return ``null`` instead
`128`	`128`	`to just skip the authentication, so Symfony can fallback to another authentication`
`129`	`129`	`method, if any.`
`130`	`130`
	`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`	`+`
`131`	`136`	`2. supportsToken`
`132`	`137`	`~~~~~~~~~~~~~~~~`
`133`	`138`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,9 @@ in your service definition:`
`36`	`36`
`37`	`37`	`..code-block::php`
`38`	`38`
	`39`	`+ // app/config/services.php`
`39`	`40`	`use Symfony\Component\DependencyInjection\Definition;`
`40`	`41`
`41`		`- // app/config/services.php`
`42`	`42`	`$definition = new Definition('...');`
`43`	`43`	`$definition->setShared(false);`
`44`	`44`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ an object and all sub-objects associated with it.`
`9`	`9`	\| Applies to\|:ref:`property or method<validation-property-target>`\|
`10`	`10`	`+----------------+---------------------------------------------------------------------+`
`11`	`11`	\| Options\| - `traverse`_\|
`12`		-\|\| - `deep`_\|
	`12`	+\|\| - `deep`_(deprecated as of 2.5)\|
`13`	`13`	\|\| - `payload`_\|
`14`	`14`	`+----------------+---------------------------------------------------------------------+`
`15`	`15`	\| Class\|:class:`Symfony\\Component\\Validator\\Constraints\\Valid`\|
@@ -271,6 +271,12 @@ set to ``true``.
`271`	`271`	`deep`
`272`	`272`	`~~~~`
`273`	`273`
	`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`	`+`
`274`	`280`	type: ``boolean`` default: ``false``
`275`	`281`
`276`	`282`	`If this constraint is applied to a property that holds an array of objects,`

Comments

(0)