Commit9df83c0

committed

Merge branch '2.8' into 3.0

2 parentsc7767ad +32eddf7 commit9df83c0Copy full SHA for 9df83c0

File tree

+32

-3

lines changed

+32

-3

lines changed

Lines changed: 29 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -418,9 +418,38 @@ All options can be documented using the`
`418`	`418`	:method:`Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::info`
`419`	`419`	`method.`
`420`	`420`
	`421`	`+..code-block::php`
	`422`	`+`
	`423`	`+ $rootNode`
	`424`	`+ ->children()`
	`425`	`+ ->integerNode('entries_per_page')`
	`426`	`+ ->info('This value is only used for the search results page.')`
	`427`	`+ ->defaultValue(25)`
	`428`	`+ ->end()`
	`429`	`+ ->end()`
	`430`	`+ ;`
	`431`	`+`
`421`	`432`	`The info will be printed as a comment when dumping the configuration tree`
`422`	`433`	with the ``config:dump-reference`` command.
`423`	`434`
	`435`	`+In YAML you may have:`
	`436`	`+`
	`437`	`+..code-block::yaml`
	`438`	`+`
	`439`	`+# This value is only used for the search results page.`
	`440`	`+entries_per_page:25`
	`441`	`+`
	`442`	`+and in XML:`
	`443`	`+`
	`444`	`+..code-block::xml`
	`445`	`+`
	`446`	`+<!-- entries-per-page: This value is only used for the search results page.-->`
	`447`	`+ <configentries-per-page="25" />`
	`448`	`+`
	`449`	`+..versionadded::2.6`
	`450`	`+ Since Symfony 2.6, the info will also be added to the exception message`
	`451`	`+ when an invalid type is given.`
	`452`	`+`
`424`	`453`	`Optional Sections`
`425`	`454`	`-----------------`
`426`	`455`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ Creating and binding an event listener to the form is very easy::`
`306`	`306`	`// If the data was submitted previously, the additional value that is`
`307`	`307`	`// included in the request variables needs to be removed.`
`308`	`308`	`if (true === $user['show_email']) {`
`309`		`- $form->add('email', EmailType::class`
	`309`	`+ $form->add('email', EmailType::class);`
`310`	`310`	`} else {`
`311`	`311`	`unset($user['email']);`
`312`	`312`	`$event->setData($user);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -16,7 +16,7 @@ According to `Wikipedia`_:
`16`	`16`	`The License`
`17`	`17`	`-----------`
`18`	`18`
`19`		`-Copyright (c) 2004-2015 Fabien Potencier`
	`19`	`+Copyright (c) 2004-2016 Fabien Potencier`
`20`	`20`
`21`	`21`	`Permission is hereby granted, free of charge, to any person obtaining a copy`
`22`	`22`	`of this software and associated documentation files (the "Software"), to deal`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ which makes all of this quite easy::`
`35`	`35`	`/**`
`36`	`36`	`* {@inheritDoc}`
`37`	`37`	`*/`
`38`		`-public function setUp()`
	`38`	`+protected function setUp()`
`39`	`39`	`{`
`40`	`40`	`self::bootKernel();`
`41`	`41`

Comments

(0)