Commitc7767ad

committed

Merge branch '2.8' into 3.0

2 parents3f7191f +172b72b commitc7767adCopy full SHA for c7767ad

File tree

2 files changed

-9

lines changed

cookbook/security
- guard-authentication.rst
reference/forms/types/options
- choice_label.rst.inc

2 files changed

-9

lines changed

`‎cookbook/security/guard-authentication.rst`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
@@ -303,7 +303,7 @@ Finally, configure your ``firewalls`` key in ``security.yml`` to use this authen
`303`	`303`
`304`	`304`	`# if you want, disable storing the user in the session`
`305`	`305`	`# stateless: true`
`306`		`-`
	`306`	`+`
`307`	`307`	`# maybe other things, like form_login, remember_me, etc`
`308`	`308`	`# ...`
`309`	`309`
`@@ -427,7 +427,7 @@ Each authenticator needs the following methods:`
`427`	`427`
`428`	`428`	`supportsRememberMe`
`429`	`429`	`If you want to support "remember me" functionality, return true from this method.`
`430`		- You will still need to active ``rememebe_me`` under your firewall for it to work.
	`430`	+ You will still need to active ``remember_me`` under your firewall for it to work.
`431`	`431`	`Since this is a stateless API, you do not want to support "remember me"`
`432`	`432`	`functionality in this example.`
`433`	`433`
`@@ -448,17 +448,17 @@ to cause a failure::`
`448`	`448`
`449`	`449`	`// src/AppBundle/Security/TokenAuthenticator.php`
`450`	`450`	`// ...`
`451`		`-`
	`451`	`+`
`452`	`452`	`use Symfony\Component\Security\Core\Exception\CustomUserMessageAuthenticationException;`
`453`		`-`
	`453`	`+`
`454`	`454`	`class TokenAuthenticator extends AbstractGuardAuthenticator`
`455`	`455`	`{`
`456`	`456`	`// ...`
`457`		`-`
	`457`	`+`
`458`	`458`	`public function getCredentials(Request $request)`
`459`	`459`	`{`
`460`	`460`	`// ...`
`461`		`-`
	`461`	`+`
`462`	`462`	`if ($token == 'ILuvAPIs') {`
`463`	`463`	`throw new CustomUserMessageAuthenticationException(`
`464`	`464`	`'ILuvAPIs is not a real API key: it\'s just a silly phrase'`
`@@ -467,7 +467,7 @@ to cause a failure::`
`467`	`467`
`468`	`468`	`// ...`
`469`	`469`	`}`
`470`		`-`
	`470`	`+`
`471`	`471`	`// ...`
`472`	`472`	`}`
`473`	`473`
`@@ -512,7 +512,7 @@ Frequently Asked Questions`
`512`	`512`
`513`	`513`	`# if you want, disable storing the user in the session`
`514`	`514`	`# stateless: true`
`515`		`-`
	`515`	`+`
`516`	`516`	`# maybe other things, like form_login, remember_me, etc`
`517`	`517`	`# ...`
`518`	`518`

`‎reference/forms/types/options/choice_label.rst.inc`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -49,7 +49,7 @@ If your choice values are objects, then ``choice_label`` can also be a
`49`	`49`	`'choices' => array(`
`50`	`50`	`new Status(Status::YES),`
`51`	`51`	`new Status(Status::NO),`
`52`		`- new Status::(Status::MAYBE),`
	`52`	`+ new Status(Status::MAYBE),`
`53`	`53`	`),`
`54`	`54`	`'choices_as_values' => true,`
`55`	`55`	`'choice_label' => 'displayName',`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitc7767ad

File tree

2 files changed

2 files changed

`‎cookbook/security/guard-authentication.rst`

`‎reference/forms/types/options/choice_label.rst.inc`

0 commit comments