Merge branch '2.7' into 2.8

fabpot · fabpot · commit 2c84ac23b40f · 2017-05-29T11:50:29.000-07:00
* 2.7:
  [Form] fix guesed value param type in docblock
diff --git a/src/Symfony/Component/Form/Guess/ValueGuess.php b/src/Symfony/Component/Form/Guess/ValueGuess.php
@@ -18,19 +18,14 @@
  */
 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 @@ public function __construct($value, $confidence)
     /**
      * Returns the guessed value.
      *
-     * @return mixed
+     * @return string|int|bool|null
      */
     public function getValue()
     {
