[Form] refactor Guess

Tobion · Tobion · commit e7e39e04e3d4 · 2012-08-28T08:15:57.000+02:00
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
      *
@@ -101,8 +90,9 @@ public static function getBestGuess(array $guesses)
      */
     public function __construct($confidence)
     {
-        if (!in_array($confidence, self::$confidences)) {
-            throw new \InvalidArgumentException(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;
