Merge branch '2.3' into 2.6

fabpot · fabpot · commit 430974d4093f · 2015-04-08T07:30:27.000+02:00
* 2.3: Remove some useless @group annotations Removed useless strtolower call [Validator] Use strict comparisons in loaders CS: Use "self" keyword instead of class name if possible
diff --git a/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -336,9 +336,6 @@ public function testValidateUniquenessWithUnrewoundArray()
         $this->assertNoViolation();
     }
 
-    /**
-     * @group GH-1635
-     */
     public function testAssociatedEntity()
     {
         $constraint = new UniqueEntity(array(
@@ -395,7 +392,6 @@ public function testAssociatedEntityWithNull()
     /**
      * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
      * @expectedExceptionMessage Associated entities are not allowed to have more than one identifier field
-     * @group GH-1635
      */
     public function testAssociatedCompositeEntity()
     {

Original file line number	Diff line number	Diff line change
`@@ -336,9 +336,6 @@ public function testValidateUniquenessWithUnrewoundArray()`
`336`	`336`	`$this->assertNoViolation();`
`337`	`337`	`}`
`338`	`338`
`339`		`- /**`
`340`		`- * @group GH-1635`
`341`		`- */`
`342`	`339`	`public function testAssociatedEntity()`
`343`	`340`	`{`
`344`	`341`	`$constraint = new UniqueEntity(array(`
`@@ -395,7 +392,6 @@ public function testAssociatedEntityWithNull()`
`395`	`392`	`/**`
`396`	`393`	`* @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException`
`397`	`394`	`* @expectedExceptionMessage Associated entities are not allowed to have more than one identifier field`
`398`		`- * @group GH-1635`
`399`	`395`	`*/`
`400`	`396`	`public function testAssociatedCompositeEntity()`
`401`	`397`	`{`