Commita758f29

committed

Merge branch '4.0' into 4.1

* 4.0: Fixed some config file paths for Flex and Symfony 4

2 parents0746f65 +d5f87ad commita758f29Copy full SHA for a758f29

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -71,14 +71,15 @@ type-hinted method arguments:`
`71`	`71`
`72`	`72`	`..code-block::yaml`
`73`	`73`
`74`		`-#app/config/config.yml`
	`74`	`+# config/packages/sensio_framework_extra.yaml`
`75`	`75`	`sensio_framework_extra:`
`76`	`76`	`request:`
`77`	`77`	`converters:true`
`78`	`78`	`auto_convert:false`
`79`	`79`
`80`	`80`	`..code-block::xml`
`81`	`81`
	`82`	`+<!-- config/packages/sensio_framework_extra.xml-->`
`82`	`83`	`<sensio-framework-extra:config>`
`83`	`84`	`<requestconverters="true"auto-convert="true" />`
`84`	`85`	`</sensio-framework-extra:config>`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ Using the Argon2i Password Encoder`
`365`	`365`
`366`	`366`	`..code-block::yaml`
`367`	`367`
`368`		`-#app/config/security.yml`
	`368`	`+# config/packages/security.yaml`
`369`	`369`	`security:`
`370`	`370`	`# ...`
`371`	`371`
`@@ -378,7 +378,7 @@ Using the Argon2i Password Encoder`
`378`	`378`
`379`	`379`	`..code-block::xml`
`380`	`380`
`381`		`-<!--app/config/security.xml-->`
	`381`	`+<!-- config/packages/security.xml-->`
`382`	`382`	`<config>`
`383`	`383`	`<!-- ...-->`
`384`	`384`	`<encoder`
`@@ -392,7 +392,7 @@ Using the Argon2i Password Encoder`
`392`	`392`
`393`	`393`	`..code-block::php`
`394`	`394`
`395`		`- //app/config/security.php`
	`395`	`+ // config/packages/security.php`
`396`	`396`	`use Symfony\Component\Security\Core\User\User;`
`397`	`397`
`398`	`398`	`$container->loadFromExtension('security', array(`

Comments

(0)