limit scope of help option

plandolt · plandolt · commit 721ffc838f4b · 2021-06-18T14:46:51.000+02:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -25,6 +25,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
+use Symfony\Component\Translation\TranslatableMessage;
 
 class FormType extends BaseType
 {
@@ -226,6 +227,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_attr', 'array');
         $resolver->setAllowedTypes('help_html', 'bool');
         $resolver->setAllowedTypes('is_empty_callback', ['null', 'callable']);
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -2669,9 +2669,6 @@ public function testHelpWithTranslationParameters()
         );
     }
 
-    /**
-     * @requires function Symfony\Component\Translation\TranslatableMessage::__construct
-     */
     public function testLabelWithTranslatableMessage()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [
@@ -2687,9 +2684,6 @@ public function testLabelWithTranslatableMessage()
         );
     }
 
-    /**
-     * @requires function Symfony\Component\Translation\TranslatableMessage::__construct
-     */
     public function testHelpWithTranslatableMessage()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [

Original file line number	Diff line number	Diff line change
`@@ -2669,9 +2669,6 @@ public function testHelpWithTranslationParameters()`
`2669`	`2669`	`);`
`2670`	`2670`	`}`
`2671`	`2671`
`2672`		`- /**`
`2673`		`- * @requires function Symfony\Component\Translation\TranslatableMessage::__construct`
`2674`		`- */`
`2675`	`2672`	`public function testLabelWithTranslatableMessage()`
`2676`	`2673`	`{`
`2677`	`2674`	`$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [`
`@@ -2687,9 +2684,6 @@ public function testLabelWithTranslatableMessage()`
`2687`	`2684`	`);`
`2688`	`2685`	`}`
`2689`	`2686`
`2690`		`- /**`
`2691`		`- * @requires function Symfony\Component\Translation\TranslatableMessage::__construct`
`2692`		`- */`
`2693`	`2687`	`public function testHelpWithTranslatableMessage()`
`2694`	`2688`	`{`
`2695`	`2689`	`$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, [`