feature #15279 Added {{ value }} message placeholder to UniqueEntityValidator (jperovic)

fabpot · fabpot · commit cda6cbafa3a3 · 2016-01-25T13:43:57.000+01:00
This PR was submitted for the 2.8 branch but it was merged into the 3.1-dev branch instead (closes #15279). Discussion ---------- Added {{ value }} message placeholder to UniqueEntityValidator | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #15268 | License | MIT | Doc PR | - Apologize if I missed something. This is my first contribution to a large scale project. Commits ------- 9cf1ce9 Added {{ value }} message placeholder to UniqueEntityValidator
diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+3.1.0
+-----
+
+ * added "{{ value }}" message placeholder to UniqueEntityValidator 
+
 3.0.0
 -----
 
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -161,6 +161,7 @@ public function testValidateUniqueness()
 
         $this->buildViolation('myMessage')
             ->atPath('property.path.name')
+            ->setParameter('{{ value }}', 'Foo')
             ->setInvalidValue('Foo')
             ->assertRaised();
     }
@@ -184,6 +185,7 @@ public function testValidateCustomErrorPath()
 
         $this->buildViolation('myMessage')
             ->atPath('property.path.bar')
+            ->setParameter('{{ value }}', 'Foo')
             ->setInvalidValue('Foo')
             ->assertRaised();
     }
@@ -235,6 +237,7 @@ public function testValidateUniquenessWithIgnoreNull()
 
         $this->buildViolation('myMessage')
             ->atPath('property.path.name')
+            ->setParameter('{{ value }}', 'Foo')
             ->setInvalidValue('Foo')
             ->assertRaised();
     }
@@ -266,6 +269,7 @@ public function testValidateUniquenessWithValidCustomErrorPath()
 
         $this->buildViolation('myMessage')
             ->atPath('property.path.name2')
+            ->setParameter('{{ value }}', 'Bar')
             ->setInvalidValue('Bar')
             ->assertRaised();
     }
@@ -398,6 +402,7 @@ public function testAssociatedEntity()
 
         $this->buildViolation('myMessage')
             ->atPath('property.path.single')
+            ->setParameter('{{ value }}', 1)
             ->setInvalidValue(1)
             ->assertRaised();
     }
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -140,6 +140,7 @@ public function validate($entity, Constraint $constraint)
 
         $this->context->buildViolation($constraint->message)
             ->atPath($errorPath)
+            ->setParameter('{{ value }}', $invalidValue)
             ->setInvalidValue($invalidValue)
             ->addViolation();
     }

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ public function validate($entity, Constraint $constraint)`
`140`	`140`
`141`	`141`	`$this->context->buildViolation($constraint->message)`
`142`	`142`	`->atPath($errorPath)`
	`143`	`+ ->setParameter('{{ value }}', $invalidValue)`
`143`	`144`	`->setInvalidValue($invalidValue)`
`144`	`145`	`->addViolation();`
`145`	`146`	`}`