Merge branch '5.0' into 5.1

nicolas-grekas · nicolas-grekas · commit 3afa4b2e724b · 2020-06-12T10:39:51.000+02:00
* 5.0:
  cs
  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
@@ -34,7 +34,7 @@ class FormValidatorFunctionalTest extends TestCase
     private $validator;
     private $formFactory;
 
-    private function doSetUp()
+    protected function setUp(): void
     {
         $this->validator = Validation::createValidatorBuilder()
             ->setMetadataFactory(new LazyLoadingMetadataFactory(new StaticMethodLoader()))

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class FormValidatorFunctionalTest extends TestCase`
`34`	`34`	`private $validator;`
`35`	`35`	`private $formFactory;`
`36`	`36`
`37`		`- private function doSetUp()`
	`37`	`+ protected function setUp(): void`
`38`	`38`	`{`
`39`	`39`	`$this->validator = Validation::createValidatorBuilder()`
`40`	`40`	`->setMetadataFactory(new LazyLoadingMetadataFactory(new StaticMethodLoader()))`