Commitc042934

committed

Merge branch '2.4' into 2.5

Conflicts:book/translation.rst

2 parents882471f +d45a60f commitc042934Copy full SHA for c042934

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,8 @@ Files and Directories`
`92`	`92`	* When you list a Symfony file/directory hierarchy, use ``your-project/`` as the
`93`	`93`	`top level directory. E.g.`
`94`	`94`
	`95`	`+ ..code-block::text`
	`96`	`+`
`95`	`97`	`your-project/`
`96`	`98`	`├─ app/`
`97`	`99`	`├─ src/`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -90,9 +90,9 @@ have some ``NameRepository`` service that you'll use to get your default value::
`90`	`90`
`91`	`91`	`public function __construct(NameRepository $nameRepository)`
`92`	`92`	`{`
`93`		`- parent::__construct();`
`94`		`-`
`95`	`93`	`$this->nameRepository = $nameRepository;`
	`94`	`+`
	`95`	`+ parent::__construct();`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`protected function configure()`

Comments

(0)