Commit96d3023

committed

Merge branch '4.1'

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

2 parentsde0f01a +a758f29 commit96d3023Copy full SHA for 96d3023

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
`@@ -368,7 +368,7 @@ Using the Argon2i Password Encoder`
`368`	`368`
`369`	`369`	`..code-block::yaml`
`370`	`370`
`371`		`-#app/config/security.yml`
	`371`	`+# config/packages/security.yaml`
`372`	`372`	`security:`
`373`	`373`	`# ...`
`374`	`374`
`@@ -381,7 +381,7 @@ Using the Argon2i Password Encoder`
`381`	`381`
`382`	`382`	`..code-block::xml`
`383`	`383`
`384`		`-<!--app/config/security.xml-->`
	`384`	`+<!-- config/packages/security.xml-->`
`385`	`385`	`<config>`
`386`	`386`	`<!-- ...-->`
`387`	`387`	`<encoder`
`@@ -395,7 +395,7 @@ Using the Argon2i Password Encoder`
`395`	`395`
`396`	`396`	`..code-block::php`
`397`	`397`
`398`		`- //app/config/security.php`
	`398`	`+ // config/packages/security.php`
`399`	`399`	`use Symfony\Component\Security\Core\User\User;`
`400`	`400`
`401`	`401`	`$container->loadFromExtension('security', array(`

Comments

(0)