bug #19309 [DoctrineBridge] added missing error code for constraint. (Koc)

fabpot · fabpot · commit f8d3ef7bc45d · 2016-07-08T08:53:03.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [DoctrineBridge] added missing error code for constraint. | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | wait for travis | Fixed tickets | #15154 | License | MIT | Doc PR | - Commits ------- 32cb269 [DoctrineBridge] added missing error code for constraint.
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -167,6 +167,7 @@ public function testValidateUniqueness()
         $this->buildViolation('myMessage')
             ->atPath('property.path.name')
             ->setInvalidValue('Foo')
+            ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
 
@@ -190,6 +191,7 @@ public function testValidateCustomErrorPath()
         $this->buildViolation('myMessage')
             ->atPath('property.path.bar')
             ->setInvalidValue('Foo')
+            ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
 
@@ -241,6 +243,7 @@ public function testValidateUniquenessWithIgnoreNull()
         $this->buildViolation('myMessage')
             ->atPath('property.path.name')
             ->setInvalidValue('Foo')
+            ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
 
@@ -272,6 +275,7 @@ public function testValidateUniquenessWithValidCustomErrorPath()
         $this->buildViolation('myMessage')
             ->atPath('property.path.name2')
             ->setInvalidValue('Bar')
+            ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
 
@@ -404,6 +408,7 @@ public function testAssociatedEntity()
         $this->buildViolation('myMessage')
             ->atPath('property.path.single')
             ->setInvalidValue($entity1)
+            ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
 
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php
@@ -23,6 +23,8 @@
  */
 class UniqueEntity extends Constraint
 {
+    const NOT_UNIQUE_ERROR = '23bd9dbf-6b9b-41cd-a99e-4844bcf3077f';
+
     public $message = 'This value is already used.';
     public $service = 'doctrine.orm.validator.unique';
     public $em = null;
@@ -31,6 +33,10 @@ class UniqueEntity extends Constraint
     public $errorPath = null;
     public $ignoreNull = true;
 
+    protected static $errorNames = array(
+        self::NOT_UNIQUE_ERROR => 'NOT_UNIQUE_ERROR',
+    );
+
     public function getRequiredOptions()
     {
         return array('fields');
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -132,11 +132,13 @@ public function validate($entity, Constraint $constraint)
             $this->context->buildViolation($constraint->message)
                 ->atPath($errorPath)
                 ->setInvalidValue($invalidValue)
+                ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
                 ->addViolation();
         } else {
             $this->buildViolation($constraint->message)
                 ->atPath($errorPath)
                 ->setInvalidValue($invalidValue)
+                ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
                 ->addViolation();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -132,11 +132,13 @@ public function validate($entity, Constraint $constraint)`
`132`	`132`	`$this->context->buildViolation($constraint->message)`
`133`	`133`	`->atPath($errorPath)`
`134`	`134`	`->setInvalidValue($invalidValue)`
	`135`	`+ ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)`
`135`	`136`	`->addViolation();`
`136`	`137`	`} else {`
`137`	`138`	`$this->buildViolation($constraint->message)`
`138`	`139`	`->atPath($errorPath)`
`139`	`140`	`->setInvalidValue($invalidValue)`
	`141`	`+ ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)`
`140`	`142`	`->addViolation();`
`141`	`143`	`}`
`142`	`144`	`}`