Merge branch '2.5' into 2.6

* 2.5:
  [Validator] use 2.5 API in LengthValidator
  fixed id for translations
  bumped Symfony version to 2.3.26
  Dutch translation for invalid charset message
  German translation for invalid charset message
  Add a Slovenian translation for invalid charset message
  Add a Polish translation.
  Test lowest deps with latest 5.3
  updated VERSION for 2.3.25
  update CONTRIBUTORS for 2.3.25
  updated CHANGELOG for 2.3.25
  Fix docblocks to comments
  Inject the correct EventDispatcher instance
  [Validator] reject ill-formed strings
  [Validator] drop grapheme_strlen in LengthValidator
  Unique Entity Validator Invalid Value
  [FrameworkBundle][config] allow multiple fallback locales.

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.en.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.sl.xlf

Author: nicolas-grekas

Tests/Validator/Constraints/UniqueEntityValidatorTest.php

@@ -244,35 +244,34 @@ public function testValidateUniquenessWithIgnoreNull()
             ->assertRaised();
     }
 
-    public function testValidateUniquenessAfterConsideringMultipleQueryResults()
+    public function testValidateUniquenessWithValidCustomErrorPath()
     {
         $constraint = new UniqueEntity(array(
             'message' => 'myMessage',
-            'fields' => array('name'),
+            'fields' => array('name', 'name2'),
             'em' => self::EM_NAME,
+            'errorPath' => "name2",
         ));
 
-        $entity1 = new SingleIntIdEntity(1, 'Foo');
-        $entity2 = new SingleIntIdEntity(2, 'Foo');
+        $entity1 = new DoubleNameEntity(1, 'Foo', "Bar");
+        $entity2 = new DoubleNameEntity(2, 'Foo', "Bar");
+
+        $this->validator->validate($entity1, $constraint);
+
+        $this->assertNoViolation();
 
         $this->em->persist($entity1);
-        $this->em->persist($entity2);
         $this->em->flush();
 
         $this->validator->validate($entity1, $constraint);
 
-        $this->buildViolation('myMessage')
-            ->atPath('property.path.name')
-            ->setInvalidValue('Foo')
-            ->assertRaised();
-
-        $this->context->getViolations()->remove(0);
+        $this->assertNoViolation();
 
         $this->validator->validate($entity2, $constraint);
 
         $this->buildViolation('myMessage')
-            ->atPath('property.path.name')
-            ->setInvalidValue('Foo')
+            ->atPath('property.path.name2')
+            ->setInvalidValue('Bar')
             ->assertRaised();
     }
 

Validator/Constraints/UniqueEntityValidator.php

@@ -132,10 +132,11 @@ public function validate($entity, Constraint $constraint)
         }
 
         $errorPath = null !== $constraint->errorPath ? $constraint->errorPath : $fields[0];
+        $invalidValue = isset($criteria[$errorPath]) ? $criteria[$errorPath] : $criteria[$fields[0]];
 
         $this->buildViolation($constraint->message)
             ->atPath($errorPath)
-            ->setInvalidValue($criteria[$fields[0]])
+            ->setInvalidValue($invalidValue)
             ->addViolation();
     }
 }