Changes based on review results

a-menshchikov · a-menshchikov · commit a86790feaeef · 2020-09-01T00:19:21.000+03:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -523,7 +523,7 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont
     {
         $loader->load('form.php');
 
-        $container->getDefinition('form.type_extension.form.validator')->setArgument(3, $config['form']['legacy_error_messages']);
+        $container->getDefinition('form.type_extension.form.validator')->setArgument(1, $config['form']['legacy_error_messages']);
 
         if (null === $config['form']['csrf_protection']['enabled']) {
             $config['form']['csrf_protection']['enabled'] = $config['csrf_protection']['enabled'];
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.php
@@ -128,6 +128,7 @@
         ->set('form.type_extension.form.validator', FormTypeValidatorExtension::class)
             ->args([
                 service('validator'),
+                true,
                 service('twig.form.renderer')->ignoreOnInvalid(),
                 service('translator')->ignoreOnInvalid(),
             ])
diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
@@ -30,7 +30,7 @@ class FormTypeValidatorExtension extends BaseValidatorExtension
     private $violationMapper;
     private $legacyErrorMessages;
 
-    public function __construct(ValidatorInterface $validator, FormRendererInterface $formRenderer = null, TranslatorInterface $translator = null, bool $legacyErrorMessages = true)
+    public function __construct(ValidatorInterface $validator, bool $legacyErrorMessages = true, FormRendererInterface $formRenderer = null, TranslatorInterface $translator = null)
     {
         $this->validator = $validator;
         $this->violationMapper = new ViolationMapper($formRenderer, $translator);
diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php
@@ -31,7 +31,7 @@ class ValidatorExtension extends AbstractExtension
     private $translator;
     private $legacyErrorMessages;
 
-    public function __construct(ValidatorInterface $validator, FormRendererInterface $formRenderer = null, TranslatorInterface $translator = null, bool $legacyErrorMessages = true)
+    public function __construct(ValidatorInterface $validator, bool $legacyErrorMessages = true, FormRendererInterface $formRenderer = null, TranslatorInterface $translator = null)
     {
         $this->legacyErrorMessages = $legacyErrorMessages;
 
@@ -59,7 +59,7 @@ public function loadTypeGuesser()
     protected function loadTypeExtensions()
     {
         return [
-            new Type\FormTypeValidatorExtension($this->validator, $this->formRenderer, $this->translator, $this->legacyErrorMessages),
+            new Type\FormTypeValidatorExtension($this->validator, $this->legacyErrorMessages, $this->formRenderer, $this->translator),
             new Type\RepeatedTypeValidatorExtension(),
             new Type\SubmitTypeValidatorExtension(),
         ];
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
@@ -28,11 +28,7 @@ class ViolationMapper implements ViolationMapperInterface
 {
     private $formRenderer;
     private $translator;
-
-    /**
-     * @var bool
-     */
-    private $allowNonSynchronized;
+    private $allowNonSynchronized = false;
 
     public function __construct(FormRendererInterface $formRenderer = null, TranslatorInterface $translator = null)
     {
diff --git a/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php b/src/Symfony/Component/Form/Test/Traits/ValidatorExtensionTrait.php
@@ -39,6 +39,6 @@ protected function getValidatorExtension(): ValidatorExtension
         $this->validator->expects($this->any())->method('getMetadataFor')->will($this->returnValue($metadata));
         $this->validator->expects($this->any())->method('validate')->will($this->returnValue(new ConstraintViolationList()));
 
-        return new ValidatorExtension($this->validator, null, null, false);
+        return new ValidatorExtension($this->validator, false);
     }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorPerformanceTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorPerformanceTest.php
@@ -23,7 +23,7 @@ class FormValidatorPerformanceTest extends FormPerformanceTestCase
     protected function getExtensions()
     {
         return [
-            new ValidatorExtension(Validation::createValidator(), null, null, false),
+            new ValidatorExtension(Validation::createValidator(), false),
         ];
     }
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
@@ -64,7 +64,7 @@ public function testValidConstraint()
     public function testGroupSequenceWithConstraintsOption()
     {
         $form = Forms::createFormFactoryBuilder()
-            ->addExtension(new ValidatorExtension(Validation::createValidator(), null, null, false))
+            ->addExtension(new ValidatorExtension(Validation::createValidator(), false))
             ->getFormFactory()
             ->create(FormTypeTest::TESTED_TYPE, null, (['validation_groups' => new GroupSequence(['First', 'Second'])]))
             ->add('field', TextTypeTest::TESTED_TYPE, [
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorExtensionTest.php
@@ -35,7 +35,7 @@ public function test2Dot5ValidationApi()
             ->setMetadataFactory($metadataFactory)
             ->getValidator();
 
-        $extension = new ValidatorExtension($validator, null, null, false);
+        $extension = new ValidatorExtension($validator, false);
 
         $this->assertInstanceOf(ValidatorTypeGuesser::class, $extension->loadTypeGuesser());
 

Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,7 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont`
`523`	`523`	`{`
`524`	`524`	`$loader->load('form.php');`
`525`	`525`
`526`		`- $container->getDefinition('form.type_extension.form.validator')->setArgument(3, $config['form']['legacy_error_messages']);`
	`526`	`+ $container->getDefinition('form.type_extension.form.validator')->setArgument(1, $config['form']['legacy_error_messages']);`
`527`	`527`
`528`	`528`	`if (null === $config['form']['csrf_protection']['enabled']) {`
`529`	`529`	`$config['form']['csrf_protection']['enabled'] = $config['csrf_protection']['enabled'];`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class FormTypeValidatorExtension extends BaseValidatorExtension`
`30`	`30`	`private $violationMapper;`
`31`	`31`	`private $legacyErrorMessages;`
`32`	`32`
`33`		`- public function __construct(ValidatorInterface $validator, FormRendererInterface $formRenderer = null, TranslatorInterface $translator = null, bool $legacyErrorMessages = true)`
	`33`	`+ public function __construct(ValidatorInterface $validator, bool $legacyErrorMessages = true, FormRendererInterface $formRenderer = null, TranslatorInterface $translator = null)`
`34`	`34`	`{`
`35`	`35`	`$this->validator = $validator;`
`36`	`36`	`$this->violationMapper = new ViolationMapper($formRenderer, $translator);`
Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,7 @@ class ViolationMapper implements ViolationMapperInterface`
`28`	`28`	`{`
`29`	`29`	`private $formRenderer;`
`30`	`30`	`private $translator;`
`31`		`-`
`32`		`- /**`
`33`		`- * @var bool`
`34`		`- */`
`35`		`- private $allowNonSynchronized;`
	`31`	`+ private $allowNonSynchronized = false;`
`36`	`32`
`37`	`33`	`public function __construct(FormRendererInterface $formRenderer = null, TranslatorInterface $translator = null)`
`38`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,6 @@ protected function getValidatorExtension(): ValidatorExtension`
`39`	`39`	`$this->validator->expects($this->any())->method('getMetadataFor')->will($this->returnValue($metadata));`
`40`	`40`	`$this->validator->expects($this->any())->method('validate')->will($this->returnValue(new ConstraintViolationList()));`
`41`	`41`
`42`		`- return new ValidatorExtension($this->validator, null, null, false);`
	`42`	`+ return new ValidatorExtension($this->validator, false);`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class FormValidatorPerformanceTest extends FormPerformanceTestCase`
`23`	`23`	`protected function getExtensions()`
`24`	`24`	`{`
`25`	`25`	`return [`
`26`		`- new ValidatorExtension(Validation::createValidator(), null, null, false),`
	`26`	`+ new ValidatorExtension(Validation::createValidator(), false),`
`27`	`27`	`];`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function testValidConstraint()`
`64`	`64`	`public function testGroupSequenceWithConstraintsOption()`
`65`	`65`	`{`
`66`	`66`	`$form = Forms::createFormFactoryBuilder()`
`67`		`- ->addExtension(new ValidatorExtension(Validation::createValidator(), null, null, false))`
	`67`	`+ ->addExtension(new ValidatorExtension(Validation::createValidator(), false))`
`68`	`68`	`->getFormFactory()`
`69`	`69`	`->create(FormTypeTest::TESTED_TYPE, null, (['validation_groups' => new GroupSequence(['First', 'Second'])]))`
`70`	`70`	`->add('field', TextTypeTest::TESTED_TYPE, [`