From e69e8b69b95397d370764bc074717411b7ab6bd3 Mon Sep 17 00:00:00 2001
From: Jovan Perovic <j.perovic87@gmail.com>
Date: Wed, 15 Jul 2015 01:35:46 +0200
Subject: [PATCH] Added {{ value }} message placeholder to
 UniqueEntityValidator

---
 src/Symfony/Bridge/Doctrine/CHANGELOG.md                     | 5 +++++
 .../Validator/Constraints/UniqueEntityValidatorTest.php      | 5 +++++
 .../Doctrine/Validator/Constraints/UniqueEntityValidator.php | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
index 4d8c44701dd3a..6bd4edb4b6a1d 100644
--- a/src/Symfony/Bridge/Doctrine/CHANGELOG.md
+++ b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+2.8.0
+-----
+
+ * added "{{ value }}" message placeholder to UniqueEntityValidator 
+
 2.7.0
 -----
 
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
index 6efeebc451818..dd3fa80e08ca2 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -166,6 +166,7 @@ public function testValidateUniqueness()
 
         $this->buildViolation('myMessage')
             ->atPath('property.path.name')
+            ->setParameter('{{ value }}', 'Foo')
             ->setInvalidValue('Foo')
             ->assertRaised();
     }
@@ -189,6 +190,7 @@ public function testValidateCustomErrorPath()
 
         $this->buildViolation('myMessage')
             ->atPath('property.path.bar')
+            ->setParameter('{{ value }}', 'Foo')
             ->setInvalidValue('Foo')
             ->assertRaised();
     }
@@ -240,6 +242,7 @@ public function testValidateUniquenessWithIgnoreNull()
 
         $this->buildViolation('myMessage')
             ->atPath('property.path.name')
+            ->setParameter('{{ value }}', 'Foo')
             ->setInvalidValue('Foo')
             ->assertRaised();
     }
@@ -271,6 +274,7 @@ public function testValidateUniquenessWithValidCustomErrorPath()
 
         $this->buildViolation('myMessage')
             ->atPath('property.path.name2')
+            ->setParameter('{{ value }}', 'Bar')
             ->setInvalidValue('Bar')
             ->assertRaised();
     }
@@ -365,6 +369,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
index 0fbf42c5bec65..7044a7a2fc009 100644
--- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
+++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -138,11 +138,13 @@ public function validate($entity, Constraint $constraint)
         if ($this->context instanceof ExecutionContextInterface) {
             $this->context->buildViolation($constraint->message)
                 ->atPath($errorPath)
+                ->setParameter('{{ value }}', $invalidValue)
                 ->setInvalidValue($invalidValue)
                 ->addViolation();
         } else {
             $this->buildViolation($constraint->message)
                 ->atPath($errorPath)
+                ->setParameter('{{ value }}', $invalidValue)
                 ->setInvalidValue($invalidValue)
                 ->addViolation();
         }