Added some tests

a-menshchikov · a-menshchikov · commit 8b1f1116ea81 · 2020-01-17T15:10:53.000+03:00
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
@@ -146,7 +146,7 @@ public function mapViolation(ConstraintViolation $violation, FormInterface $form
             if (false !== $label && null !== $this->translator) {
                 $label = $this->translator->trans(
                     $label,
-                    $scope->getConfig()->getOption('label_translation_parameters'),
+                    $scope->getConfig()->getOption('label_translation_parameters', []),
                     $scope->getConfig()->getOption('translation_domain')
                 );
             }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
@@ -22,9 +22,11 @@
 use Symfony\Component\Form\FormConfigBuilder;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormRenderer;
 use Symfony\Component\PropertyAccess\PropertyPath;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
@@ -1565,4 +1567,74 @@ public function testBacktrackIfSeveralSubFormsWithSamePropertyPath()
         $this->assertEquals([$this->getFormError($violation2, $grandChild2)], iterator_to_array($grandChild2->getErrors()), $grandChild2->getName().' should have an error, but has none');
         $this->assertEquals([$this->getFormError($violation3, $grandChild3)], iterator_to_array($grandChild3->getErrors()), $grandChild3->getName().' should have an error, but has none');
     }
+
+    public function testMessageWithLabel1()
+    {
+        $renderer = $this->getMockBuilder(FormRenderer::class)
+            ->setMethods(null)
+            ->disableOriginalConstructor()
+            ->getMock()
+        ;
+        $translator = $this->getMockBuilder(TranslatorInterface::class)->getMock();
+        $translator->expects($this->any())->method('trans')->willReturnMap([
+            ['Name', [], null, null, 'Custom Name'],
+        ]);
+        $this->mapper = new ViolationMapper($renderer, $translator);
+
+        $parent = $this->getForm('parent');
+        $child = $this->getForm('name', 'name');
+        $parent->add($child);
+
+        $parent->submit([]);
+
+        $violation = new ConstraintViolation('Message {{ label }}', null, [], null, 'data.name', null);
+        $this->mapper->mapViolation($violation, $parent);
+
+        $this->assertCount(1, $child->getErrors(), $child->getName().' should have an error, but has none');
+
+        $errors = iterator_to_array($child->getErrors());
+        if (isset($errors[0])) {
+            /** @var FormError $error */
+            $error = $errors[0];
+            $this->assertSame('Message Custom Name', $error->getMessage());
+        }
+    }
+
+    public function testMessageWithLabel2()
+    {
+        $translator = $this->getMockBuilder(TranslatorInterface::class)->getMock();
+        $translator->expects($this->any())->method('trans')->willReturnMap([
+            ['options_label', [], null, null, 'Translated Label'],
+        ]);
+        $this->mapper = new ViolationMapper(null, $translator);
+
+        $parent = $this->getForm('parent');
+
+        $config = new FormConfigBuilder('name', null, $this->dispatcher, [
+            'error_mapping' => [],
+            'label' => 'options_label',
+        ]);
+        $config->setMapped(true);
+        $config->setInheritData(false);
+        $config->setPropertyPath('name');
+        $config->setCompound(true);
+        $config->setDataMapper(new PropertyPathMapper());
+
+        $child = new Form($config);
+        $parent->add($child);
+
+        $parent->submit([]);
+
+        $violation = new ConstraintViolation('Message {{ label }}', null, [], null, 'data.name', null);
+        $this->mapper->mapViolation($violation, $parent);
+
+        $this->assertCount(1, $child->getErrors(), $child->getName().' should have an error, but has none');
+
+        $errors = iterator_to_array($child->getErrors());
+        if (isset($errors[0])) {
+            /** @var FormError $error */
+            $error = $errors[0];
+            $this->assertSame('Message Translated Label', $error->getMessage());
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public function mapViolation(ConstraintViolation $violation, FormInterface $form`
`146`	`146`	`if (false !== $label && null !== $this->translator) {`
`147`	`147`	`$label = $this->translator->trans(`
`148`	`148`	`$label,`
`149`		`- $scope->getConfig()->getOption('label_translation_parameters'),`
	`149`	`+ $scope->getConfig()->getOption('label_translation_parameters', []),`
`150`	`150`	`$scope->getConfig()->getOption('translation_domain')`
`151`	`151`	`);`
`152`	`152`	`}`