Add unique entity violation cause

Ilya Vertakov · Ilya Vertakov · commit 52b260f59c15 · 2017-08-09T22:55:49.000+04:00
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -190,6 +190,7 @@ public function testValidateUniqueness()
             ->atPath('property.path.name')
             ->setParameter('{{ value }}', '"Foo"')
             ->setInvalidValue($entity2)
+            ->setCause([$entity1])
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
@@ -215,6 +216,7 @@ public function testValidateCustomErrorPath()
             ->atPath('property.path.bar')
             ->setParameter('{{ value }}', '"Foo"')
             ->setInvalidValue($entity2)
+            ->setCause([$entity1])
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
@@ -268,6 +270,7 @@ public function testValidateUniquenessWithIgnoreNullDisabled()
             ->atPath('property.path.name')
             ->setParameter('{{ value }}', '"Foo"')
             ->setInvalidValue('Foo')
+            ->setCause([$entity1])
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
@@ -346,6 +349,7 @@ public function testValidateUniquenessWithValidCustomErrorPath()
             ->atPath('property.path.name2')
             ->setParameter('{{ value }}', '"Bar"')
             ->setInvalidValue('Bar')
+            ->setCause([$entity1])
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
@@ -481,6 +485,7 @@ public function testAssociatedEntity()
             ->setParameter('{{ value }}', 'object("Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity") identified by (id => 1)')
             ->setInvalidValue($entity1)
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
+            ->setCause([$associated, $associated2])
             ->assertRaised();
     }
 
@@ -517,6 +522,7 @@ public function testValidateUniquenessNotToStringEntityWithAssociatedEntity()
             ->atPath('property.path.single')
             ->setParameter('{{ value }}', $expectedValue)
             ->setInvalidValue($entity1)
+            ->setCause([$associated, $associated2])
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
@@ -575,6 +581,7 @@ public function testValidateUniquenessWithArrayValue()
             ->atPath('property.path.phoneNumbers')
             ->setParameter('{{ value }}', 'array')
             ->setInvalidValue(array(123))
+            ->setCause([$entity1])
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
@@ -652,6 +659,7 @@ public function testValidateInheritanceUniqueness()
             ->atPath('property.path.name')
             ->setInvalidValue('Foo')
             ->setCode('23bd9dbf-6b9b-41cd-a99e-4844bcf3077f')
+            ->setCause([$entity1])
             ->setParameters(array('{{ value }}' => '"Foo"'))
             ->assertRaised();
     }
@@ -703,6 +711,7 @@ public function testValidateUniquenessWithCompositeObjectNoToStringIdEntity()
             ->atPath('property.path.objectOne')
             ->setParameter('{{ value }}', $expectedValue)
             ->setInvalidValue($objectOne)
+            ->setCause([$entity])
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
@@ -730,6 +739,43 @@ public function testValidateUniquenessWithCustomDoctrineTypeValue()
             ->atPath('property.path.name')
             ->setParameter('{{ value }}', $expectedValue)
             ->setInvalidValue($existingEntity->name)
+            ->setCause([$existingEntity])
+            ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
+            ->assertRaised();
+    }
+
+    /**
+     * This is a functional test as there is a large integration necessary to get the validator working.
+     */
+    public function testValidateUniquenessCause()
+    {
+        $constraint = new UniqueEntity(array(
+            'message' => 'myMessage',
+            'fields' => array('name'),
+            'em' => self::EM_NAME,
+        ));
+
+        $entity1 = new SingleIntIdEntity(1, 'Foo');
+        $entity2 = new SingleIntIdEntity(2, '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')
+            ->setParameter('{{ value }}', '"Foo"')
+            ->setInvalidValue($entity2)
+            ->setCause([$entity1])
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -171,6 +171,7 @@ public function validate($entity, Constraint $constraint)
             ->setParameter('{{ value }}', $this->formatWithIdentifiers($em, $class, $invalidValue))
             ->setInvalidValue($invalidValue)
             ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
+            ->setCause($result)
             ->addViolation();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,7 @@ public function validate($entity, Constraint $constraint)`
`171`	`171`	`->setParameter('{{ value }}', $this->formatWithIdentifiers($em, $class, $invalidValue))`
`172`	`172`	`->setInvalidValue($invalidValue)`
`173`	`173`	`->setCode(UniqueEntity::NOT_UNIQUE_ERROR)`
	`174`	`+ ->setCause($result)`
`174`	`175`	`->addViolation();`
`175`	`176`	`}`
`176`	`177`