make sure that null can be the invalid value

xabbuh · xabbuh · commit 29c553d84aca · 2017-02-07T22:51:41.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/DoubleNameEntity.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/DoubleNameEntity.php
@@ -21,7 +21,7 @@ class DoubleNameEntity
     /** @Id @Column(type="integer") */
     protected $id;
 
-    /** @Column(type="string") */
+    /** @Column(type="string", nullable=true) */
     public $name;
 
     /** @Column(type="string", nullable=true) */
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -261,6 +261,37 @@ public function testAllConfiguredFieldsAreCheckedOfBeingMappedByDoctrineWithIgno
         $this->validator->validate($entity1, $constraint);
     }
 
+    public function testErrorIsMappedToFirstFieldEvenIfItIsNullAndNullValuesAreIgnored()
+    {
+        $constraint = new UniqueEntity(array(
+            'message' => 'myMessage',
+            'fields' => array('name', 'name2'),
+            'em' => self::EM_NAME,
+            'ignoreNull' => true,
+        ));
+
+        $entity1 = new DoubleNameEntity(1, null, 'Foo');
+        $entity2 = new DoubleNameEntity(2, null, 'Foo');
+
+        $this->validator->validate($entity1, $constraint);
+
+        $this->assertNoViolation();
+
+        $this->em->persist($entity1);
+        $this->em->flush();
+
+        $this->validator->validate($entity1, $constraint);
+
+        $this->assertNoViolation();
+
+        $this->validator->validate($entity2, $constraint);
+
+        $this->buildViolation('myMessage')
+            ->atPath('property.path.name')
+            ->setInvalidValue(null)
+            ->assertRaised();
+    }
+
     public function testValidateUniquenessWithValidCustomErrorPath()
     {
         $constraint = new UniqueEntity(array(
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -80,12 +80,14 @@ public function validate($entity, Constraint $constraint)
         /* @var $class \Doctrine\Common\Persistence\Mapping\ClassMetadata */
 
         $criteria = array();
+        $fieldValues = array();
         foreach ($fields as $fieldName) {
             if (!$class->hasField($fieldName) && !$class->hasAssociation($fieldName)) {
                 throw new ConstraintDefinitionException(sprintf('The field "%s" is not mapped by Doctrine, so it cannot be validated for uniqueness.', $fieldName));
             }
 
             $fieldValue = $class->reflFields[$fieldName]->getValue($entity);
+            $fieldValues[$fieldName] = $fieldValue;
 
             if ($constraint->ignoreNull && null === $fieldValue) {
                 continue;
@@ -134,7 +136,7 @@ public function validate($entity, Constraint $constraint)
         }
 
         $errorPath = null !== $constraint->errorPath ? $constraint->errorPath : $fields[0];
-        $invalidValue = isset($criteria[$errorPath]) ? $criteria[$errorPath] : $criteria[$fields[0]];
+        $invalidValue = isset($criteria[$errorPath]) ? $criteria[$errorPath] : $fieldValues[$fields[0]];
 
         if ($this->context instanceof ExecutionContextInterface) {
             $this->context->buildViolation($constraint->message)
