Merge branch '5.0' into 5.1

nicolas-grekas · nicolas-grekas · commit 5b70cc8ac8b0 · 2020-06-12T10:22:42.000+02:00
* 5.0:
  fix merge
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php
@@ -18,7 +18,6 @@
 use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormFactoryBuilder;
-use Symfony\Component\Form\Test\ForwardCompatTestTrait;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Collection;
 use Symfony\Component\Validator\Constraints\Expression;
@@ -32,8 +31,6 @@
 
 class FormValidatorFunctionalTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     private $validator;
     private $formFactory;
 
