[Form] Allow TranslatableInterface to the FormType help option

Author: alamirault

CHANGELOG.md

@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
 * Allow passing `TranslatableInterface` objects to the `ChoiceView` label
+* Allow passing `TranslatableInterface` objects to the `help` option
 
 6.1
 ---

Extension/Core/Type/FormType.php

@@ -24,7 +24,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
-use Symfony\Component\Translation\TranslatableMessage;
+use Symfony\Contracts\Translation\TranslatableInterface;
 
 class FormType extends BaseType
 {
@@ -220,7 +220,7 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('label_attr', 'array');
         $resolver->setAllowedTypes('action', 'string');
         $resolver->setAllowedTypes('upload_max_size_message', ['callable']);
-        $resolver->setAllowedTypes('help', ['string', 'null', TranslatableMessage::class]);
+        $resolver->setAllowedTypes('help', ['string', 'null', TranslatableInterface::class]);
         $resolver->setAllowedTypes('help_attr', 'array');
         $resolver->setAllowedTypes('help_html', 'bool');
         $resolver->setAllowedTypes('is_empty_callback', ['null', 'callable']);

Tests/AbstractLayoutTest.php

@@ -20,6 +20,8 @@
 use Symfony\Component\Form\Test\FormIntegrationTestCase;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Symfony\Component\Translation\TranslatableMessage;
+use Symfony\Contracts\Translation\TranslatableInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 abstract class AbstractLayoutTest extends FormIntegrationTestCase
 {
@@ -2699,6 +2701,28 @@ public function testHelpWithTranslatableMessage()
         );
     }
 
+    public function testHelpWithTranslatableInterface()
+    {
+        $message = new class() implements TranslatableInterface {
+            public function trans(TranslatorInterface $translator, string $locale = null): string
+            {
+                return $translator->trans('foo');
+            }
+        };
+
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
+            'help' => $message,
+        ]);
+        $html = $this->renderHelp($form->createView());
+
+        $this->assertMatchesXpath($html,
+            '/*
+    [@id="name_help"]
+    [.="[trans]foo[/trans]"]
+'
+        );
+    }
+
     public function testAttributesWithTranslationParameters()
     {
         $this->requiresFeatureSet(403);