Merge branch '4.4'

nicolas-grekas · nicolas-grekas · commit 43fc289bcad2 · 2019-10-30T14:48:35.000+01:00
* 4.4:
  [Validator] fix merge
diff --git a/Tests/ConstraintViolationTest.php b/Tests/ConstraintViolationTest.php
@@ -14,6 +14,7 @@
 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
`@@ -14,6 +14,7 @@`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`	`15`	`use Symfony\Component\Validator\ConstraintViolation;`
`16`	`16`	`use Symfony\Component\Validator\Tests\Fixtures\CustomArrayObject;`
	`17`	`+use Symfony\Component\Validator\Tests\Fixtures\ToString;`
`17`	`18`
`18`	`19`	`class ConstraintViolationTest extends TestCase`
`19`	`20`	`{`