Commitf962e9a

committed

Merge branch '2.1' into 2.2

2 parentsb0d7e95 +735e2db commitf962e9aCopy full SHA for f962e9a

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ Extract attribute and/or node values from the list of nodes::`
`138`	`138`	`Call an anonymous function on each node of the list::`
`139`	`139`
`140`	`140`	`$nodeValues = $crawler->filter('p')->each(function ($node, $i) {`
`141`		`- return $node->nodeValue;`
	`141`	`+ return $node->text();`
`142`	`142`	`});`
`143`	`143`
`144`	`144`	`The anonymous function receives the position and the node as arguments.`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ and return the resulting response to the browser.`
`40`	`40`
`41`	`41`	`Because every request is routed through it, the front controller can be`
`42`	`42`	`used to perform global initializations prior to setting up the kernel or`
`43`		-to`decorate`_ the kernel with additional features. Examples include:
	`43`	+to `decorate`_ the kernel with additional features. Examples include:
`44`	`44`
`45`	`45`	`* Configuring the autoloader or adding additional autoloading mechanisms;`
`46`	`46`	`* Adding HTTP level caching by wrapping the kernel with an instance of`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@`
`4`	`4`	`How to implement your own Voter to blacklist IP Addresses`
`5`	`5`	`=========================================================`
`6`	`6`
`7`		`-The Symfony2 security component provides several layers toauthenticate users.`
	`7`	`+The Symfony2 security component provides several layers toauthorize users.`
`8`	`8`	One of the layers is called a `voter`. A voter is a dedicated class that checks
`9`	`9`	`if the user has the rights to be connected to the application. For instance,`
`10`		`-Symfony2 provides a layer that checks if the user is fullyauthenticated or if`
	`10`	`+Symfony2 provides a layer that checks if the user is fullyauthorized or if`
`11`	`11`	`it has some expected roles.`
`12`	`12`
`13`	`13`	`It is sometimes useful to create a custom voter to handle a specific case not`

Comments

(0)