Commitaa5f86b

committed

Merge branch '6.0' into 6.1

* 6.0: Use fourth argument of RoutingConfigurator instead of non-existent method Correcting bugs for provider and JSON login

2 parents038872a +c49360d commitaa5f86bCopy full SHA for aa5f86b

File tree

+10

-7

lines changed

+10

-7

lines changed

Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1427,9 +1427,14 @@ when importing the routes.`
`1427`	`1427`	`use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;`
`1428`	`1428`
`1429`	`1429`	`return function (RoutingConfigurator $routes) {`
`1430`		`- // use the optional fourth argument of import() to exclude some files`
`1431`		`- // or subdirectories when loading annotations`
`1432`		`- $routes->import('../../src/Controller/', 'annotation')`
	`1430`	`+ $routes->import(`
	`1431`	`+ '../../src/Controller/',`
	`1432`	`+ 'annotation',`
	`1433`	`+ false,`
	`1434`	`+ // the optional fourth argument is used to exclude some files`
	`1435`	`+ // or subdirectories when loading annotations`
	`1436`	`+ '../../src/Controller/{DebugEmailController}.php'`
	`1437`	`+ )`
`1433`	`1438`	`// this is added to the beginning of all imported route URLs`
`1434`	`1439`	`->prefix('/blog')`
`1435`	`1440`
`@@ -1442,9 +1447,6 @@ when importing the routes.`
`1442`	`1447`
`1443`	`1448`	`// these requirements are added to all imported routes`
`1444`	`1449`	`->requirements(['_locale' => 'en\|es\|fr'])`
`1445`		`-`
`1446`		`- // you can optionally exclude some files/subdirectories when loading annotations`
`1447`		`- ->exclude('../../src/Controller/{DebugEmailController}.php')`
`1448`	`1450`	`;`
`1449`	`1451`	`};`
`1450`	`1452`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,8 @@ will be able to authenticate (e.g. login form, API token, etc).`
`486`	`486`	`security:false`
`487`	`487`	`main:`
`488`	`488`	`lazy:true`
`489`		`-provider:users_in_memory`
	`489`	`+# provider that you set earlier inside providers`
	`490`	`+provider:app_user_provider`
`490`	`491`
`491`	`492`	`# activate different ways to authenticate`
`492`	`493`	`# https://symfony.com/doc/current/security.html#firewalls-authentication`

Comments

(0)