merged branch Tobion/formguess (PR #5361)

fabpot · fabpot · commit deb41a10de5b · 2012-08-29T13:44:34.000+02:00
Commits ------- e7e39e0 [Form] refactor Guess dcbeeb1 [Form] replaced UnexpectedValueException by InvalidArgumentException in Guess Discussion ---------- [Form] replaced UnexpectedValueException by InvalidArgumentException in Guess BC break: yes this is a better fit because the error is a logic exception (that can be detected at compile time, i.e. when writing the code) instead of a runtime exception --------------------------------------------------------------------------- by bschussek at 2012-08-29T10:51:54Z :+1:
diff --git a/src/Symfony/Component/Form/Guess/Guess.php b/src/Symfony/Component/Form/Guess/Guess.php
@@ -46,17 +46,6 @@ abstract class Guess
      */
     const LOW_CONFIDENCE = 0;
 
-    /**
-     * The list of allowed confidence values
-     * @var array
-     */
-    private static $confidences = array(
-        self::VERY_HIGH_CONFIDENCE,
-        self::HIGH_CONFIDENCE,
-        self::MEDIUM_CONFIDENCE,
-        self::LOW_CONFIDENCE,
-    );
-
     /**
      * The confidence about the correctness of the value
      *
@@ -97,12 +86,13 @@ public static function getBestGuess(array $guesses)
      *
      * @param integer $confidence The confidence
      *
-     * @throws \UnexpectedValueException if the given value of confidence is unknown
+     * @throws \InvalidArgumentException if the given value of confidence is unknown
      */
     public function __construct($confidence)
     {
-        if (!in_array($confidence, self::$confidences)) {
-            throw new \UnexpectedValueException(sprintf('The confidence should be one of "%s"', implode('", "', self::$confidences)));
+        if (self::VERY_HIGH_CONFIDENCE !== $confidence && self::HIGH_CONFIDENCE !== $confidence && 
+            self::MEDIUM_CONFIDENCE !== $confidence && self::LOW_CONFIDENCE !== $confidence) {
+            throw new \InvalidArgumentException('The confidence should be one of the constants defined in Guess.');
         }
 
         $this->confidence = $confidence;
diff --git a/src/Symfony/Component/Form/Tests/Guess/GuessTest.php b/src/Symfony/Component/Form/Tests/Guess/GuessTest.php
@@ -27,7 +27,7 @@ public function testGetBestGuessReturnsGuessWithHighestConfidence()
     }
 
     /**
-     * @expectedException \UnexpectedValueException
+     * @expectedException \InvalidArgumentException
      */
     public function testGuessExpectsValidConfidence()
     {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function testGetBestGuessReturnsGuessWithHighestConfidence()`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`/**`
`30`		`- * @expectedException \UnexpectedValueException`
	`30`	`+ * @expectedException \InvalidArgumentException`
`31`	`31`	`*/`
`32`	`32`	`public function testGuessExpectsValidConfidence()`
`33`	`33`	`{`