Merge branch '2.7' into 2.8

* 2.7:
  [Form] fix guesed value param type in docblock
This commit is contained in:
Fabien Potencier 2017-05-29 11:50:29 -07:00
commit 2c84ac23b4

View File

@ -18,19 +18,14 @@ namespace Symfony\Component\Form\Guess;
*/
class ValueGuess extends Guess
{
/**
* The guessed value.
*
* @var array
*/
private $value;
/**
* Constructor.
*
* @param string $value The guessed value
* @param int $confidence The confidence that the guessed class name
* is correct
* @param string|int|bool|null $value The guessed value
* @param int $confidence The confidence that the guessed class name
* is correct
*/
public function __construct($value, $confidence)
{
@ -42,7 +37,7 @@ class ValueGuess extends Guess
/**
* Returns the guessed value.
*
* @return mixed
* @return string|int|bool|null
*/
public function getValue()
{