merged branch widop/patch-1 (PR symfony#4447)

fabpot · fabpot · commit f15c9cd19ddb · 2012-05-30T07:10:15.000+02:00
Commits ------- 395004c [Bridge][Doctrine] Fix missing dot in unique entity error message Discussion ---------- [Bridge][Doctrine] Fix missing dot in unique entity error message Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: none Todo: none License of the code: MIT Documentation PR: none The translation message defined in the FrameworkExtraBundle defines the unique entity error message like that: ``This value is already used.`` but is defined without the dot in the Doctrine UniqueEntity validator. This PR fixes this issue. --------------------------------------------------------------------------- by travisbot at 2012-05-29T12:31:59Z This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1464732) (merged 675c744c into adf07f1). --------------------------------------------------------------------------- by travisbot at 2012-05-29T14:24:48Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1465598) (merged 395004c into adf07f1).
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php
@@ -127,7 +127,7 @@ public function testValidateUniqueness()
         $this->assertEquals(1, $violationsList->count(), "No violations found on entity after it was saved to the database.");
 
         $violation = $violationsList[0];
-        $this->assertEquals('This value is already used', $violation->getMessage());
+        $this->assertEquals('This value is already used.', $violation->getMessage());
         $this->assertEquals('name', $violation->getPropertyPath());
         $this->assertEquals('Foo', $violation->getInvalidValue());
     }
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php
@@ -21,7 +21,7 @@
  */
 class UniqueEntity extends Constraint
 {
-    public $message = 'This value is already used';
+    public $message = 'This value is already used.';
     public $service = 'doctrine.orm.validator.unique';
     public $em = null;
     public $fields = array();

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public function testValidateUniqueness()`
`127`	`127`	`$this->assertEquals(1, $violationsList->count(), "No violations found on entity after it was saved to the database.");`
`128`	`128`
`129`	`129`	`$violation = $violationsList[0];`
`130`		`- $this->assertEquals('This value is already used', $violation->getMessage());`
	`130`	`+ $this->assertEquals('This value is already used.', $violation->getMessage());`
`131`	`131`	`$this->assertEquals('name', $violation->getPropertyPath());`
`132`	`132`	`$this->assertEquals('Foo', $violation->getInvalidValue());`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*/`
`22`	`22`	`class UniqueEntity extends Constraint`
`23`	`23`	`{`
`24`		`- public $message = 'This value is already used';`
	`24`	`+ public $message = 'This value is already used.';`
`25`	`25`	`public $service = 'doctrine.orm.validator.unique';`
`26`	`26`	`public $em = null;`
`27`	`27`	`public $fields = array();`