symfony
diff --git a/‎src/Symfony/Component/Form/Extension/Validator/Constraints/Form.php
Lines changed: 10 additions & 1 deletion b/‎src/Symfony/Component/Form/Extension/Validator/Constraints/Form.php
Lines changed: 10 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
Lines changed: 2 additions & 1 deletion b/‎src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
Lines changed: 8 additions & 6 deletions b/‎src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
Lines changed: 8 additions & 6 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Validator/Constraint.php
Lines changed: 29 additions & 0 deletions b/‎src/Symfony/Component/Validator/Constraint.php
Lines changed: 29 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Constraints/CardScheme.php
Lines changed: 9 additions & 0 deletions b/‎src/Symfony/Component/Validator/Constraints/CardScheme.php
Lines changed: 9 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Constraints/Choice.php
Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Component/Validator/Constraints/Choice.php
Lines changed: 10 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Constraints/Collection.php
Lines changed: 8 additions & 1 deletion b/‎src/Symfony/Component/Validator/Constraints/Collection.php
Lines changed: 8 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Validator/Constraints/CollectionValidator.php
Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/Validator/Constraints/CollectionValidator.php
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Constraints/Count.php
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Constraints/Count.php
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Constraints/CountValidator.php
Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/Validator/Constraints/CountValidator.php
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Constraints/Date.php
Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Validator/Constraints/Date.php
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Constraints/DateTime.php
Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Component/Validator/Constraints/DateTime.php
Lines changed: 10 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Constraints/DateTimeValidator.php
Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Component/Validator/Constraints/DateTimeValidator.php
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Constraints/DateValidator.php
Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/Validator/Constraints/DateValidator.php
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Validator/Constraints/Email.php
Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Component/Validator/Constraints/Email.php
Lines changed: 10 additions & 0 deletions
@@ -18,11 +18,20 @@
  */
 class Form extends Constraint
 {
+    const ERROR_NOT_SYNCHRONIZED = 1;
+    const ERROR_NO_SUCH_FIELD = 2;
+
     /**
-     * Violation code marking an invalid form.
+     * @deprecated Deprecated since Symfony 2.6, to be removed in 3.0. Use
+     *             {@self ERROR_NOT_SYNCHRONIZED} instead.
      */
     const ERR_INVALID = 1;
 
+    protected static $errorNames = array(
+        self::ERROR_NOT_SYNCHRONIZED => 'ERROR_NOT_SYNCHRONIZED',
+        self::ERROR_NO_SUCH_FIELD => 'ERROR_NO_SUCH_FIELD',
+    );
+
     /**
      * {@inheritdoc}
      */
 
@@ -102,7 +102,7 @@ public function validate($form, Constraint $constraint)
                 $this->buildViolation($config->getOption('invalid_message'))
                     ->setParameters(array_replace(array('{{ value }}' => $clientDataAsString), $config->getOption('invalid_message_parameters')))
                     ->setInvalidValue($form->getViewData())
-                    ->setCode(Form::ERR_INVALID)
+                    ->setCode(Form::ERROR_NOT_SYNCHRONIZED)
                     ->addViolation();
             }
         }
@@ -112,6 +112,7 @@ public function validate($form, Constraint $constraint)
             $this->buildViolation($config->getOption('extra_fields_message'))
                 ->setParameter('{{ extra_fields }}', implode('", "', array_keys($form->getExtraData())))
                 ->setInvalidValue($form->getExtraData())
+                ->setCode(Form::ERROR_NO_SUCH_FIELD)
                 ->addViolation();
         }
     }
 
@@ -66,7 +66,7 @@ public function validateForm(FormEvent $event)
             foreach ($violations as $violation) {
                 // Allow the "invalid" constraint to be put onto
                 // non-synchronized forms
-                $allowNonSynchronized = Form::ERR_INVALID === $violation->getCode();
+                $allowNonSynchronized = Form::ERROR_NOT_SYNCHRONIZED === $violation->getCode();
 
                 $this->violationMapper->mapViolation($violation, $form, $allowNonSynchronized);
             }
 
@@ -229,7 +229,7 @@ function () { throw new TransformationFailedException(); }
             ->setParameter('{{ value }}', 'foo')
             ->setParameter('{{ foo }}', 'bar')
             ->setInvalidValue('foo')
-            ->setCode(Form::ERR_INVALID)
+            ->setCode(Form::ERROR_NOT_SYNCHRONIZED)
             ->assertRaised();
     }
 
@@ -263,7 +263,7 @@ function () { throw new TransformationFailedException(); }
             ->setParameter('{{ value }}', 'foo')
             ->setParameter('{{ foo }}', 'bar')
             ->setInvalidValue('foo')
-            ->setCode(Form::ERR_INVALID)
+            ->setCode(Form::ERROR_NOT_SYNCHRONIZED)
             ->assertRaised();
     }
 
@@ -296,7 +296,7 @@ function () { throw new TransformationFailedException(); }
         $this->buildViolation('invalid_message_key')
             ->setParameter('{{ value }}', 'foo')
             ->setInvalidValue('foo')
-            ->setCode(Form::ERR_INVALID)
+            ->setCode(Form::ERROR_NOT_SYNCHRONIZED)
             ->assertRaised();
     }
 
@@ -549,9 +549,11 @@ public function testViolationIfExtraData()
 
         $this->validator->validate($form, new Form());
 
-        $this->assertViolation('Extra!', array(
-            '{{ extra_fields }}' => 'foo',
-        ), 'property.path', array('foo' => 'bar'));
+        $this->buildViolation('Extra!')
+            ->setParameter('{{ extra_fields }}', 'foo')
+            ->setInvalidValue(array('foo' => 'bar'))
+            ->setCode(Form::ERROR_NO_SUCH_FIELD)
+            ->assertRaised();
     }
 
     public function testNoViolationIfAllowExtraData()
 
@@ -109,7 +109,7 @@ public function testMapViolation()
 
     public function testMapViolationAllowsNonSyncIfInvalid()
     {
-        $violation = $this->getConstraintViolation(Form::ERR_INVALID);
+        $violation = $this->getConstraintViolation(Form::ERROR_NOT_SYNCHRONIZED);
         $form = $this->getForm('street');
 
         $this->validator->expects($this->once())
 
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Validator;
 
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
+use Symfony\Component\Validator\Exception\InvalidArgumentException;
 use Symfony\Component\Validator\Exception\InvalidOptionsException;
 use Symfony\Component\Validator\Exception\MissingOptionsException;
 
@@ -50,12 +51,40 @@ abstract class Constraint
      */
     const PROPERTY_CONSTRAINT = 'property';
 
+    /**
+     * Maps error codes to the names of their constants
+     * @var array
+     */
+    protected static $errorNames = array();
+
     /**
      * Domain-specific data attached to a constraint
      * @var mixed
      */
     public $payload;
 
+    /**
+     * Returns the name of the given error code.
+     *
+     * @param int $errorCode The error code
+     *
+     * @return string The name of the error code
+     *
+     * @throws InvalidArgumentException If the error code does not exist
+     */
+    public static function getErrorName($errorCode)
+    {
+        if (!isset(static::$errorNames[$errorCode])) {
+            throw new InvalidArgumentException(sprintf(
+                'The error code "%s" does not exist for constraint of type "%s".',
+                $errorCode,
+                get_called_class()
+            ));
+        }
+
+        return static::$errorNames[$errorCode];
+    }
+
     /**
      * Initializes the constraint with options.
      *
 
@@ -20,9 +20,18 @@
  * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
  *
  * @author Tim Nagel <t.nagel@infinite.net.au>
+ * @author Bernhard Schussek <bschussek@gmail.com>
  */
 class CardScheme extends Constraint
 {
+    const ERROR_NOT_NUMERIC = 1;
+    const ERROR_INVALID_FORMAT = 2;
+
+    protected static $errorNames = array(
+        self::ERROR_NOT_NUMERIC => 'ERROR_NOT_NUMERIC',
+        self::ERROR_INVALID_FORMAT => 'ERROR_INVALID_FORMAT',
+    );
+
     public $message = 'Unsupported card type or invalid card number.';
     public $schemes;
 
 
@@ -117,6 +117,7 @@ public function validate($value, Constraint $constraint)
         if (!is_numeric($value)) {
             $this->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
+                ->setCode(CardScheme::ERROR_NOT_NUMERIC)
                 ->addViolation();
 
             return;
@@ -135,6 +136,7 @@ public function validate($value, Constraint $constraint)
 
         $this->buildViolation($constraint->message)
             ->setParameter('{{ value }}', $this->formatValue($value))
+            ->setCode(CardScheme::ERROR_INVALID_FORMAT)
             ->addViolation();
     }
 }
@@ -23,6 +23,16 @@
  */
 class Choice extends Constraint
 {
+    const ERROR_NO_SUCH_CHOICE = 1;
+    const ERROR_TOO_FEW = 2;
+    const ERROR_TOO_MANY = 3;
+
+    protected static $errorNames = array(
+        self::ERROR_NO_SUCH_CHOICE => 'ERROR_NO_SUCH_CHOICE',
+        self::ERROR_TOO_FEW => 'ERROR_TOO_FEW',
+        self::ERROR_TOO_MANY => 'ERROR_TOO_MANY',
+    );
+
     public $choices;
     public $callback;
     public $multiple = false;
 
@@ -65,6 +65,7 @@ public function validate($value, Constraint $constraint)
                 if (!in_array($_value, $choices, $constraint->strict)) {
                     $this->buildViolation($constraint->multipleMessage)
                         ->setParameter('{{ value }}', $this->formatValue($_value))
+                        ->setCode(Choice::ERROR_NO_SUCH_CHOICE)
                         ->setInvalidValue($_value)
                         ->addViolation();
 
@@ -78,6 +79,7 @@ public function validate($value, Constraint $constraint)
                 $this->buildViolation($constraint->minMessage)
                     ->setParameter('{{ limit }}', $constraint->min)
                     ->setPlural((int) $constraint->min)
+                    ->setCode(Choice::ERROR_TOO_FEW)
                     ->addViolation();
 
                 return;
@@ -87,13 +89,15 @@ public function validate($value, Constraint $constraint)
                 $this->buildViolation($constraint->maxMessage)
                     ->setParameter('{{ limit }}', $constraint->max)
                     ->setPlural((int) $constraint->max)
+                    ->setCode(Choice::ERROR_TOO_MANY)
                     ->addViolation();
 
                 return;
             }
         } elseif (!in_array($value, $choices, $constraint->strict)) {
             $this->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
+                ->setCode(Choice::ERROR_NO_SUCH_CHOICE)
                 ->addViolation();
         }
     }
 
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
 
 /**
@@ -24,6 +23,14 @@
  */
 class Collection extends Composite
 {
+    const ERROR_MISSING_FIELD = 1;
+    const ERROR_NO_SUCH_FIELD = 2;
+
+    protected static $errorNames = array(
+        self::ERROR_MISSING_FIELD => 'ERROR_MISSING_FIELD',
+        self::ERROR_NO_SUCH_FIELD => 'ERROR_NO_SUCH_FIELD',
+    );
+
     public $fields = array();
     public $allowExtraFields = false;
     public $allowMissingFields = false;
 
@@ -73,6 +73,7 @@ public function validate($value, Constraint $constraint)
                     ->atPath('['.$field.']')
                     ->setParameter('{{ field }}', $this->formatValue($field))
                     ->setInvalidValue(null)
+                    ->setCode(Collection::ERROR_MISSING_FIELD)
                     ->addViolation();
             }
         }
@@ -84,6 +85,7 @@ public function validate($value, Constraint $constraint)
                         ->atPath('['.$field.']')
                         ->setParameter('{{ field }}', $this->formatValue($field))
                         ->setInvalidValue($fieldValue)
+                        ->setCode(Collection::ERROR_NO_SUCH_FIELD)
                         ->addViolation();
                 }
             }
 
@@ -24,6 +24,14 @@
  */
 class Count extends Constraint
 {
+    const ERROR_TOO_FEW = 1;
+    const ERROR_TOO_MANY = 2;
+
+    protected static $errorNames = array(
+        self::ERROR_TOO_FEW => 'ERROR_TOO_FEW',
+        self::ERROR_TOO_MANY => 'ERROR_TOO_MANY',
+    );
+
     public $minMessage = 'This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.';
     public $maxMessage = 'This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.';
     public $exactMessage = 'This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.';
 
@@ -41,6 +41,7 @@ public function validate($value, Constraint $constraint)
                 ->setParameter('{{ limit }}', $constraint->max)
                 ->setInvalidValue($value)
                 ->setPlural((int) $constraint->max)
+                ->setCode(Count::ERROR_TOO_MANY)
                 ->addViolation();
 
             return;
@@ -52,6 +53,7 @@ public function validate($value, Constraint $constraint)
                 ->setParameter('{{ limit }}', $constraint->min)
                 ->setInvalidValue($value)
                 ->setPlural((int) $constraint->min)
+                ->setCode(Count::ERROR_TOO_FEW)
                 ->addViolation();
         }
     }
 
@@ -23,5 +23,13 @@
  */
 class Date extends Constraint
 {
+    const ERROR_INVALID_FORMAT = 1;
+    const ERROR_INVALID_DATE = 2;
+
+    protected static $errorNames = array(
+        self::ERROR_INVALID_FORMAT => 'ERROR_INVALID_FORMAT',
+        self::ERROR_INVALID_DATE => 'ERROR_INVALID_DATE',
+    );
+
     public $message = 'This value is not a valid date.';
 }
@@ -23,5 +23,15 @@
  */
 class DateTime extends Constraint
 {
+    const ERROR_INVALID_FORMAT = 1;
+    const ERROR_INVALID_DATE = 2;
+    const ERROR_INVALID_TIME = 3;
+
+    protected static $errorNames = array(
+        self::ERROR_INVALID_FORMAT => 'ERROR_INVALID_FORMAT',
+        self::ERROR_INVALID_DATE => 'ERROR_INVALID_DATE',
+        self::ERROR_INVALID_TIME => 'ERROR_INVALID_TIME',
+    );
+
     public $message = 'This value is not a valid datetime.';
 }
@@ -45,6 +45,7 @@ public function validate($value, Constraint $constraint)
         if (!preg_match(static::PATTERN, $value, $matches)) {
             $this->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
+                ->setCode(DateTime::ERROR_INVALID_FORMAT)
                 ->addViolation();
 
             return;
@@ -53,12 +54,14 @@ public function validate($value, Constraint $constraint)
         if (!DateValidator::checkDate($matches[1], $matches[2], $matches[3])) {
             $this->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
+                ->setCode(DateTime::ERROR_INVALID_DATE)
                 ->addViolation();
         }
 
         if (!TimeValidator::checkTime($matches[4], $matches[5], $matches[6])) {
             $this->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
+                ->setCode(DateTime::ERROR_INVALID_TIME)
                 ->addViolation();
         }
     }
 
@@ -62,6 +62,7 @@ public function validate($value, Constraint $constraint)
         if (!preg_match(static::PATTERN, $value, $matches)) {
             $this->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
+                ->setCode(Date::ERROR_INVALID_FORMAT)
                 ->addViolation();
 
             return;
@@ -70,6 +71,7 @@ public function validate($value, Constraint $constraint)
         if (!self::checkDate($matches[1], $matches[2], $matches[3])) {
             $this->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
+                ->setCode(Date::ERROR_INVALID_DATE)
                 ->addViolation();
         }
     }
 
@@ -23,6 +23,16 @@
  */
 class Email extends Constraint
 {
+    const ERROR_INVALID_FORMAT = 1;
+    const ERROR_MX_CHECK_FAILED = 2;
+    const ERROR_HOST_CHECK_FAILED = 3;
+
+    protected static $errorNames = array(
+        self::ERROR_INVALID_FORMAT => 'ERROR_STRICT_CHECK_FAILED',
+        self::ERROR_MX_CHECK_FAILED => 'ERROR_MX_CHECK_FAILED',
+        self::ERROR_HOST_CHECK_FAILED => 'ERROR_HOST_CHECK_FAILED',
+    );
+
     public $message = 'This value is not a valid email address.';
     public $checkMX = false;
     public $checkHost = false;