[Form] replaced UnexpectedValueException by InvalidArgumentException in Guess

Tobion · Tobion · commit dcbeeb1df72f · 2012-08-28T08:15:56.000+02:00
this is a better fit because the error is a logic exception instead of a runtime exception
diff --git a/src/Symfony/Component/Form/Guess/Guess.php b/src/Symfony/Component/Form/Guess/Guess.php
@@ -97,12 +97,12 @@ 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)));
+            throw new \InvalidArgumentException(sprintf('The confidence should be one of "%s"', implode('", "', self::$confidences)));
         }
 
         $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
`@@ -97,12 +97,12 @@ public static function getBestGuess(array $guesses)`
`97`	`97`	`*`
`98`	`98`	`* @param integer $confidence The confidence`
`99`	`99`	`*`
`100`		`- * @throws \UnexpectedValueException if the given value of confidence is unknown`
	`100`	`+ * @throws \InvalidArgumentException if the given value of confidence is unknown`
`101`	`101`	`*/`
`102`	`102`	`public function __construct($confidence)`
`103`	`103`	`{`
`104`	`104`	`if (!in_array($confidence, self::$confidences)) {`
`105`		`- throw new \UnexpectedValueException(sprintf('The confidence should be one of "%s"', implode('", "', self::$confidences)));`
	`105`	`+ throw new \InvalidArgumentException(sprintf('The confidence should be one of "%s"', implode('", "', self::$confidences)));`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`$this->confidence = $confidence;`
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`	`{`