Commit13adec3

committed

Merge branch '2.8' into 3.2

* 2.8: Use Twig's namespaced paths Minor reword Clearify setup of basic auth for test environment

2 parents74cda20 +9539ca9 commit13adec3Copy full SHA for 13adec3

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -153,7 +153,7 @@ block and set the value of two variables called ``icon`` and ``text``:
`153`	`153`
`154`	`154`	`..code-block::html+twig`
`155`	`155`
`156`		`- {% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}`
	`156`	`+ {% extends '@WebProfiler/Profiler/layout.html.twig' %}`
`157`	`157`
`158`	`158`	`{% block toolbar %}`
`159`	`159`	`{% set icon %}`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,14 +30,16 @@ firewall, but only in the configuration file used by tests:`
`30`	`30`	`# app/config/config_test.yml`
`31`	`31`	`security:`
`32`	`32`	`firewalls:`
`33`		`-your_firewall_name:`
	`33`	`+# replace 'main' by the name of your own firewall`
	`34`	`+main:`
`34`	`35`	`http_basic:~`
`35`	`36`
`36`	`37`	`..code-block::xml`
`37`	`38`
`38`	`39`	`<!-- app/config/config_test.xml-->`
`39`	`40`	`<security:config>`
`40`		`- <security:firewallname="your_firewall_name">`
	`41`	`+<!-- replace 'main' by the name of your own firewall-->`
	`42`	`+ <security:firewallname="main">`
`41`	`43`	`<security:http-basic />`
`42`	`44`	`</security:firewall>`
`43`	`45`	`</security:config>`
`@@ -47,7 +49,8 @@ firewall, but only in the configuration file used by tests:`
`47`	`49`	`// app/config/config_test.php`
`48`	`50`	`$container->loadFromExtension('security', array(`
`49`	`51`	`'firewalls' => array(`
`50`		`- 'your_firewall_name' => array(`
	`52`	`+ // replace 'main' by the name of your own firewall`
	`53`	`+ 'main' => array(`
`51`	`54`	`'http_basic' => array(),`
`52`	`55`	`),`
`53`	`56`	`),`

Comments

(0)