Commitcf61d87

committed

Merge branch '2.3' into 2.7

2 parents139e2e7 +1653948 commitcf61d87Copy full SHA for cf61d87

File tree

-7

lines changed

-7

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ on a "remember-me" cookie, or even authenticated anonymously?`
`120`	`120`	`// any object`
`121`	`121`	`$object = ...;`
`122`	`122`
`123`		`- $vote = $authenticatedVoter->vote($token, $object, array('IS_AUTHENTICATED_FULLY');`
	`123`	`+ $vote = $authenticatedVoter->vote($token, $object, array('IS_AUTHENTICATED_FULLY'));`
`124`	`124`
`125`	`125`	`RoleVoter`
`126`	`126`	`~~~~~~~~~`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,8 @@ directory and execute the following commands:`
`33`	`33`	`..code-block::bash`
`34`	`34`
`35`	`35`	`$ composer require leafo/scssphp`
`36`		`- $ composer require patchwork/jsqueeze:"~1.0"`
	`36`	`+ $ composer require patchwork/jsqueeze`
`37`	`37`
`38`		-It's very important to maintain the ``~1.0`` version constraint for the ``jsqueeze``
`39`		`-dependency because the most recent stable version is not compatible with Assetic.`
`40`	`38`
`41`	`39`	`Organizing your Web Asset Files`
`42`	`40`	`-------------------------------`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ For the configuration example in the previous section, the array passed to your`
`139`	`139`	`array(`
`140`	`140`	`'twitter' => array(`
`141`	`141`	`'client_id' => 123,`
`142`		`- 'client_secret' => '$secret',`
	`142`	`+ 'client_secret' => 'your_secret',`
`143`	`143`	`),`
`144`	`144`	`),`
`145`	`145`	`)`
`@@ -155,7 +155,7 @@ beneath it, the incoming array might look like this::`
`155`	`155`	`array(`
`156`	`156`	`'twitter' => array(`
`157`	`157`	`'client_id' => 123,`
`158`		`- 'client_secret' => '$secret',`
	`158`	`+ 'client_secret' => 'your_secret',`
`159`	`159`	`),`
`160`	`160`	`),`
`161`	`161`	`// values from config_dev.yml`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ quickly.`
`11`	`11`	`..tip::`
`12`	`12`
`13`	`13`	`Due to the amount of filesystem operations in Symfony (e.g. updating cache`
`14`		`- files and writing to log files), Symfony can slow downsignifcantly. To`
	`14`	`+ files and writing to log files), Symfony can slow downsignificantly. To`
`15`	`15`	improve the speed, consider:ref:`overriding the cache and log directories<override-cache-dir>`
`16`	`16`	`to a location outside the NFS share (for instance, by using`
`17`	`17`	:phpfunction:`sys_get_temp_dir`). You can read `this blog post`_ for more

-5.13 KB

Comments

(0)