fix merge

nicolas-grekas · nicolas-grekas · commit 6dee37cc3f22 · 2019-08-26T11:20:32.000+02:00
diff --git a/Tests/ConstraintViolationTest.php b/Tests/ConstraintViolationTest.php
@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\ConstraintViolation;
+use Symfony\Component\Validator\Tests\Fixtures\CustomArrayObject;
+use Symfony\Component\Validator\Tests\Fixtures\ToString;
 
 class ConstraintViolationTest extends TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`	`15`	`use Symfony\Component\Validator\ConstraintViolation;`
	`16`	`+use Symfony\Component\Validator\Tests\Fixtures\CustomArrayObject;`
	`17`	`+use Symfony\Component\Validator\Tests\Fixtures\ToString;`
`16`	`18`
`17`	`19`	`class ConstraintViolationTest extends TestCase`
`18`	`20`	`{`