Taking into account label_format option

a-menshchikov · a-menshchikov · commit e8bedf65536e · 2020-09-01T10:37:06.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
@@ -131,7 +131,23 @@ public function mapViolation(ConstraintViolation $violation, FormInterface $form
 
         // Only add the error if the form is synchronized
         if ($this->acceptsErrors($scope)) {
-            $label = $scope->getConfig()->getOption('label');
+            $labelFormat = $scope->getConfig()->getOption('label_format');
+
+            if (null !== $labelFormat) {
+                $label = str_replace(
+                    [
+                        '%name%',
+                        '%id%',
+                    ],
+                    [
+                        $scope->getName(),
+                        (string) $scope->getPropertyPath(),
+                    ],
+                    $labelFormat
+                );
+            } else {
+                $label = $scope->getConfig()->getOption('label');
+            }
 
             if (null === $label && null !== $this->formRenderer) {
                 $label = $this->formRenderer->humanize($scope->getName());
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
@@ -1662,4 +1662,80 @@ public function testMessageWithLabel2()
             $this->assertSame('Message Translated Label', $error->getMessage());
         }
     }
+
+    public function testMessageWithLabelFormat1()
+    {
+        $translator = $this->getMockBuilder(TranslatorInterface::class)->getMock();
+        $translator->expects($this->any())->method('trans')->willReturnMap([
+            ['form.custom', [], null, null, 'Translated 1st Custom Label'],
+        ]);
+        $this->mapper = new ViolationMapper(null, $translator);
+
+        $parent = $this->getForm('parent');
+
+        $config = new FormConfigBuilder('custom', null, $this->dispatcher, [
+            'error_mapping' => [],
+            'label_format' => 'form.%name%',
+        ]);
+        $config->setMapped(true);
+        $config->setInheritData(false);
+        $config->setPropertyPath('custom');
+        $config->setCompound(true);
+        $config->setDataMapper(new PropertyPathMapper());
+
+        $child = new Form($config);
+        $parent->add($child);
+
+        $parent->submit([]);
+
+        $violation = new ConstraintViolation('Message {{ label }}', null, [], null, 'data.custom', 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 1st Custom Label', $error->getMessage());
+        }
+    }
+
+    public function testMessageWithLabelFormat2()
+    {
+        $translator = $this->getMockBuilder(TranslatorInterface::class)->getMock();
+        $translator->expects($this->any())->method('trans')->willReturnMap([
+            ['form_custom-id', [], null, null, 'Translated 2nd Custom Label'],
+        ]);
+        $this->mapper = new ViolationMapper(null, $translator);
+
+        $parent = $this->getForm('parent');
+
+        $config = new FormConfigBuilder('custom-id', null, $this->dispatcher, [
+            'error_mapping' => [],
+            'label_format' => 'form_%id%',
+        ]);
+        $config->setMapped(true);
+        $config->setInheritData(false);
+        $config->setPropertyPath('custom-id');
+        $config->setCompound(true);
+        $config->setDataMapper(new PropertyPathMapper());
+
+        $child = new Form($config);
+        $parent->add($child);
+
+        $parent->submit([]);
+
+        $violation = new ConstraintViolation('Message {{ label }}', null, [], null, 'data.custom-id', 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 2nd Custom Label', $error->getMessage());
+        }
+    }
 }
