Form config + tests + changelog

a-menshchikov · a-menshchikov · commit 32267a1ee8c1 · 2020-08-22T22:40:16.000+03:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -521,7 +521,7 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont
     {
         $loader->load('form.php');
 
-        $container->getDefinition('form.type_extension.form.validator')->setArgument(1, $config['form']['legacy_error_messages']);
+        $container->getDefinition('form.type_extension.form.validator')->setArgument(3, $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
@@ -125,7 +125,11 @@
             ->args([service('request_stack')])
 
         ->set('form.type_extension.form.validator', FormTypeValidatorExtension::class)
-            ->args([service('validator')])
+            ->args([
+                service('validator'),
+                service('twig.form.renderer')->ignoreOnInvalid(),
+                service('translator')->ignoreOnInvalid(),
+            ])
             ->tag('form.type_extension', ['extended-type' => FormType::class])
 
         ->set('form.type_extension.repeated.validator', RepeatedTypeValidatorExtension::class)
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+5.2.0
+-----
+
+ * Added support for using the `{{ label }}` placeholder in constraint messages, which is replaced in the `ViolationMapper` by the corresponding field form label.
+
 5.1.0
 -----
 
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, false);
+        return new ValidatorExtension($this->validator, null, null, 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(), false),
+            new ValidatorExtension(Validation::createValidator(), null, null, 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(), false))
+            ->addExtension(new ValidatorExtension(Validation::createValidator(), null, null, 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, false);
+        $extension = new ValidatorExtension($validator, null, null, false);
 
         $this->assertInstanceOf(ValidatorTypeGuesser::class, $extension->loadTypeGuesser());
 

Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,7 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont`
`521`	`521`	`{`
`522`	`522`	`$loader->load('form.php');`
`523`	`523`
`524`		`- $container->getDefinition('form.type_extension.form.validator')->setArgument(1, $config['form']['legacy_error_messages']);`
	`524`	`+ $container->getDefinition('form.type_extension.form.validator')->setArgument(3, $config['form']['legacy_error_messages']);`
`525`	`525`
`526`	`526`	`if (null === $config['form']['csrf_protection']['enabled']) {`
`527`	`527`	`$config['form']['csrf_protection']['enabled'] = $config['csrf_protection']['enabled'];`
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, false);`
	`42`	`+ return new ValidatorExtension($this->validator, null, null, 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(), false),`
	`26`	`+ new ValidatorExtension(Validation::createValidator(), null, null, 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(), false))`
	`67`	`+ ->addExtension(new ValidatorExtension(Validation::createValidator(), null, null, false))`
`68`	`68`	`->getFormFactory()`
`69`	`69`	`->create(FormTypeTest::TESTED_TYPE, null, (['validation_groups' => new GroupSequence(['First', 'Second'])]))`
`70`	`70`	`->add('field', TextTypeTest::TESTED_TYPE, [`