Commit721ffc8

committed

limit scope of help option

1 parentac7bb46 commit721ffc8Copy full SHA for 721ffc8

File tree

-6

lines changed

src/Symfony/Component/Form
- Extension/Core/Type
  - FormType.php
- Tests
  - AbstractLayoutTest.php

-6

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`useSymfony\Component\OptionsResolver\OptionsResolver;`
`26`	`26`	`useSymfony\Component\PropertyAccess\PropertyAccess;`
`27`	`27`	`useSymfony\Component\PropertyAccess\PropertyAccessorInterface;`
	`28`	`+useSymfony\Component\Translation\TranslatableMessage;`
`28`	`29`
`29`	`30`	`class FormTypeextends BaseType`
`30`	`31`	`{`
`@@ -226,6 +227,7 @@ public function configureOptions(OptionsResolver $resolver)`
`226`	`227`	`$resolver->setAllowedTypes('label_attr','array');`
`227`	`228`	`$resolver->setAllowedTypes('action','string');`
`228`	`229`	`$resolver->setAllowedTypes('upload_max_size_message', ['callable']);`
	`230`	`+$resolver->setAllowedTypes('help', ['string','null', TranslatableMessage::class]);`
`229`	`231`	`$resolver->setAllowedTypes('help_attr','array');`
`230`	`232`	`$resolver->setAllowedTypes('help_html','bool');`
`231`	`233`	`$resolver->setAllowedTypes('is_empty_callback', ['null','callable']);`

Lines changed: 0 additions & 6 deletions

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`	`publicfunctiontestLabelWithTranslatableMessage()`
`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`	`publicfunctiontestHelpWithTranslatableMessage()`
`2694`	`2688`	`{`
`2695`	`2689`	`$form =$this->factory->createNamed('name','Symfony\Component\Form\Extension\Core\Type\TextType',null, [`

Comments

(0)