Merge branch '2.3' into 2.7

fabpot · fabpot · commit dea1508c9656 · 2016-04-05T18:36:43.000+02:00
* 2.3:
  [HttpFoundation] Improve phpdoc
  [Logging] Add support for firefox in ChromePhpHandler
  [Security] Fixed SwitchUserListener when exiting an impersonication with AnonymousToken
  [Form] fix "prototype" not required when parent form is not required
diff --git a/Request.php b/Request.php
@@ -715,7 +715,7 @@ public static function getHttpMethodParameterOverride()
      * public property instead (query, attributes, request).
      *
      * @param string $key     the key
-     * @param mixed  $default the default value
+     * @param mixed  $default the default value if the parameter key does not exist
      * @param bool   $deep    is parameter deep in multidimensional array
      *
      * @return mixed

Original file line number	Diff line number	Diff line change
`@@ -715,7 +715,7 @@ public static function getHttpMethodParameterOverride()`
`715`	`715`	`* public property instead (query, attributes, request).`
`716`	`716`	`*`
`717`	`717`	`* @param string $key the key`
`718`		`- * @param mixed $default the default value`
	`718`	`+ * @param mixed $default the default value if the parameter key does not exist`
`719`	`719`	`* @param bool $deep is parameter deep in multidimensional array`
`720`	`720`	`*`
`721`	`721`	`* @return mixed`