Merge branch '3.1'

xabbuh · xabbuh · commit 031b85029ef9 · 2016-07-12T10:09:12.000+02:00
* 3.1:
  [DoctrineBridge] add missing error code
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -450,6 +450,7 @@ public function testValidateUniquenessNotToStringEntityWithAssociatedEntity()
             ->atPath('property.path.single')
             ->setParameter('{{ value }}', $expectedValue)
             ->setInvalidValue($expectedValue)
+            ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
             ->assertRaised();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -450,6 +450,7 @@ public function testValidateUniquenessNotToStringEntityWithAssociatedEntity()`
`450`	`450`	`->atPath('property.path.single')`
`451`	`451`	`->setParameter('{{ value }}', $expectedValue)`
`452`	`452`	`->setInvalidValue($expectedValue)`
	`453`	`+ ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)`
`453`	`454`	`->assertRaised();`
`454`	`455`	`}`
`455`	`456`