Merge branch '4.2' into 4.3

nicolas-grekas · nicolas-grekas · commit a65edaadbffd · 2019-06-11T17:41:59.000+02:00
* 4.2: [WebProfilerBundle] fix FC with HttpFoundation v5 [OptionsResolver] fix adding $triggerDeprecation to Options::offsetGet() [Form] test case is not legacy Fix reporting unsilenced deprecations from insulated tests Added FormInterface to @return Form::getClickedButton docblock
diff --git a/Options.php b/Options.php
@@ -16,8 +16,6 @@
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  * @author Tobias Schultze <http://tobion.de>
- *
- * @method mixed offsetGet(string $option, bool $triggerDeprecation = true)
  */
 interface Options extends \ArrayAccess, \Countable
 {

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@`
`16`	`16`	`*`
`17`	`17`	`* @author Bernhard Schussek <bschussek@gmail.com>`
`18`	`18`	`* @author Tobias Schultze <http://tobion.de>`
`19`		`- *`
`20`		`- * @method mixed offsetGet(string $option, bool $triggerDeprecation = true)`
`21`	`19`	`*/`
`22`	`20`	`interface Options extends \ArrayAccess, \Countable`
`23`	`21`	`{`