Skip to content

Commit 6ecace0

Browse files
soullivaneuhsoullivaneuh
committed
Fix deprecated forms setDefaultOptions method
1 parent 99678a4 commit 6ecace0

19 files changed

+245
-14
lines changed

‎Form/Core/Type/CaptchaType.php‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
use Symfony\Component\Form\FormBuilderInterface;
1616
use Symfony\Component\Form\FormView;
1717
use Symfony\Component\Form\FormInterface;
18-
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
18+
use Symfony\Component\OptionsResolver\OptionsResolver;
19+
1920

2021
use Genemu\Bundle\FormBundle\Gd\Type\Captcha;
2122
use Genemu\Bundle\FormBundle\Form\Core\Validator\CaptchaValidator;
23+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
2224

2325
/**
2426
* CaptchaType
@@ -72,8 +74,18 @@ public function buildView(FormView $view, FormInterface $form, array $options)
7274

7375
/**
7476
* {@inheritdoc}
77+
*
78+
* @todo Remove it when bumping requirements to SF 2.7+
7579
*/
7680
public function setDefaultOptions(OptionsResolverInterface $resolver)
81+
{
82+
$this->configureOptions($resolver);
83+
}
84+
85+
/**
86+
* {@inheritdoc}
87+
*/
88+
public function configureOptions(OptionsResolver $resolver)
7789
{
7890
$defaults = array_merge(
7991
array('attr' => array('autocomplete' => 'off')),

‎Form/Core/Type/PlainType.php‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
use Symfony\Component\Form\FormInterface;
77
use Symfony\Component\Form\FormView;
88
use Symfony\Component\OptionsResolver\Options;
9-
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
9+
use Symfony\Component\OptionsResolver\OptionsResolver;
10+
1011

1112
use Symfony\Component\Form\Extension\Core\Type\DateType;
13+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
1214

1315
/**
1416
* A Form type that just renders the field as a p tag. This is useful for forms where certain field
@@ -20,8 +22,18 @@ class PlainType extends AbstractType
2022
{
2123
/**
2224
* {@inheritdoc}
25+
*
26+
* @todo Remove it when bumping requirements to SF 2.7+
2327
*/
2428
public function setDefaultOptions(OptionsResolverInterface $resolver)
29+
{
30+
$this->configureOptions($resolver);
31+
}
32+
33+
/**
34+
* {@inheritdoc}
35+
*/
36+
public function configureOptions(OptionsResolver $resolver)
2537
{
2638
$resolver->setDefaults(array(
2739
'widget' => 'field',

‎Form/Core/Type/ReCaptchaType.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818
use Symfony\Component\Form\FormBuilderInterface;
1919
use Symfony\Component\Form\Exception\FormException;
2020
use Symfony\Component\OptionsResolver\Options;
21+
use Symfony\Component\OptionsResolver\OptionsResolver;
2122
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
2223

24+
2325
/**
2426
* ReCaptchaType
2527
*
@@ -79,8 +81,18 @@ public function buildView(FormView $view, FormInterface $form, array $options)
7981

8082
/**
8183
* {@inheritdoc}
84+
*
85+
* @todo Remove it when bumping requirements to SF 2.7+
8286
*/
8387
public function setDefaultOptions(OptionsResolverInterface $resolver)
88+
{
89+
$this->configureOptions($resolver);
90+
}
91+
92+
/**
93+
* {@inheritdoc}
94+
*/
95+
public function configureOptions(OptionsResolver $resolver)
8496
{
8597
$configs = array_merge(array(
8698
'lang' => \Locale::getDefault(),

‎Form/Core/Type/TinymceType.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
use Symfony\Component\Form\FormInterface;
1616
use Symfony\Component\Form\FormView;
1717
use Symfony\Component\OptionsResolver\Options;
18+
use Symfony\Component\OptionsResolver\OptionsResolver;
1819
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
1920

21+
2022
/**
2123
* TinymceType
2224
*
@@ -46,8 +48,18 @@ public function buildView(FormView $view, FormInterface $form, array $options)
4648

4749
/**
4850
* {@inheritdoc}
51+
*
52+
* @todo Remove it when bumping requirements to SF 2.7+
4953
*/
5054
public function setDefaultOptions(OptionsResolverInterface $resolver)
55+
{
56+
$this->configureOptions($resolver);
57+
}
58+
59+
/**
60+
* {@inheritdoc}
61+
*/
62+
public function configureOptions(OptionsResolver $resolver)
5163
{
5264
$configs = array_merge(array(
5365
'language' => \Locale::getDefault(),

‎Form/Doctrine/Type/AjaxDocumentType.php‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
use Doctrine\Common\Persistence\ManagerRegistry;
1616
use Genemu\Bundle\FormBundle\Form\Doctrine\ChoiceList\AjaxEntityChoiceList;
1717
use Symfony\Component\OptionsResolver\Options;
18+
use Symfony\Component\OptionsResolver\OptionsResolver;
1819
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
1920

21+
2022
/**
2123
* AjaxDocumentType
2224
*
@@ -36,10 +38,20 @@ public function __construct(ManagerRegistry $registry)
3638
$this->registry = $registry;
3739
}
3840

39-
/**
41+
/**
4042
* {@inheritdoc}
43+
*
44+
* @todo Remove it when bumping requirements to SF 2.7+
4145
*/
4246
public function setDefaultOptions(OptionsResolverInterface $resolver)
47+
{
48+
$this->configureOptions($resolver);
49+
}
50+
51+
/**
52+
* {@inheritdoc}
53+
*/
54+
public function configureOptions(OptionsResolver $resolver)
4355
{
4456
$resolver->setDefaults(array(
4557
'document_manager' => null,

‎Form/Doctrine/Type/AjaxEntityType.php‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@
1313

1414
use Symfony\Component\Form\AbstractType;
1515
use Symfony\Component\OptionsResolver\Options;
16-
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
16+
use Symfony\Component\OptionsResolver\OptionsResolver;
17+
1718

1819
use Doctrine\Common\Persistence\ManagerRegistry;
1920

2021
use Genemu\Bundle\FormBundle\Form\Doctrine\ChoiceList\AjaxEntityChoiceList;
22+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
2123

2224
/**
2325
* AjaxEntityType
@@ -40,8 +42,18 @@ public function __construct(ManagerRegistry $registry)
4042

4143
/**
4244
* {@inheritdoc}
45+
*
46+
* @todo Remove it when bumping requirements to SF 2.7+
4347
*/
4448
public function setDefaultOptions(OptionsResolverInterface $resolver)
49+
{
50+
$this->configureOptions($resolver);
51+
}
52+
53+
/**
54+
* {@inheritdoc}
55+
*/
56+
public function configureOptions(OptionsResolver $resolver)
4557
{
4658
$registry = $this->registry;
4759

‎Form/JQuery/Type/AutocompleteType.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
use Symfony\Component\Form\FormInterface;
1818
use Symfony\Component\Form\FormView;
1919
use Symfony\Component\OptionsResolver\Options;
20+
use Symfony\Component\OptionsResolver\OptionsResolver;
21+
2022
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
2123
use Symfony\Component\PropertyAccess\PropertyPath;
2224
use Symfony\Component\PropertyAccess\PropertyAccess;
@@ -58,8 +60,18 @@ public function buildView(FormView $view, FormInterface $form, array $options)
5860

5961
/**
6062
* {@inheritdoc}
63+
*
64+
* @todo Remove it when bumping requirements to SF 2.7+
6165
*/
6266
public function setDefaultOptions(OptionsResolverInterface $resolver)
67+
{
68+
$this->configureOptions($resolver);
69+
}
70+
71+
/**
72+
* {@inheritdoc}
73+
*/
74+
public function configureOptions(OptionsResolver $resolver)
6375
{
6476
$type = $this->type;
6577
$registry = $this->registry;

‎Form/JQuery/Type/AutocompleterType.php‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616
use Symfony\Component\Form\FormView;
1717
use Symfony\Component\Form\FormInterface;
1818
use Symfony\Component\OptionsResolver\Options;
19-
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
19+
use Symfony\Component\OptionsResolver\OptionsResolver;
20+
2021

2122
use Genemu\Bundle\FormBundle\Form\Core\ChoiceList\AjaxSimpleChoiceList;
2223
use Genemu\Bundle\FormBundle\Form\Core\DataTransformer\ChoiceToJsonTransformer;
24+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
2325

2426
/**
2527
* @author Olivier Chauvel <[email protected]>
@@ -81,8 +83,18 @@ public function buildView(FormView $view, FormInterface $form, array $options)
8183

8284
/**
8385
* {@inheritdoc}
86+
*
87+
* @todo Remove it when bumping requirements to SF 2.7+
8488
*/
8589
public function setDefaultOptions(OptionsResolverInterface $resolver)
90+
{
91+
$this->configureOptions($resolver);
92+
}
93+
94+
/**
95+
* {@inheritdoc}
96+
*/
97+
public function configureOptions(OptionsResolver $resolver)
8698
{
8799
$widget = $this->widget;
88100

‎Form/JQuery/Type/ChosenType.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
use Symfony\Component\Form\FormView;
1616
use Symfony\Component\Form\FormInterface;
1717
use Symfony\Component\OptionsResolver\Options;
18+
use Symfony\Component\OptionsResolver\OptionsResolver;
1819
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
1920

21+
2022
/**
2123
* ChosenType to JQueryLib
2224
*
@@ -52,8 +54,18 @@ public function buildView(FormView $view, FormInterface $form, array $options)
5254

5355
/**
5456
* {@inheritdoc}
57+
*
58+
* @todo Remove it when bumping requirements to SF 2.7+
5559
*/
5660
public function setDefaultOptions(OptionsResolverInterface $resolver)
61+
{
62+
$this->configureOptions($resolver);
63+
}
64+
65+
/**
66+
* {@inheritdoc}
67+
*/
68+
public function configureOptions(OptionsResolver $resolver)
5769
{
5870
$resolver
5971
->setDefaults(array(

‎Form/JQuery/Type/ColorType.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
use Symfony\Component\Form\FormBuilderInterface;
1616
use Symfony\Component\Form\FormView;
1717
use Symfony\Component\Form\FormInterface;
18+
use Symfony\Component\OptionsResolver\OptionsResolver;
1819
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
1920

21+
2022
/**
2123
* ColorType
2224
*
@@ -35,8 +37,18 @@ public function buildView(FormView $view, FormInterface $form, array $options)
3537

3638
/**
3739
* {@inheritdoc}
40+
*
41+
* @todo Remove it when bumping requirements to SF 2.7+
3842
*/
3943
public function setDefaultOptions(OptionsResolverInterface $resolver)
44+
{
45+
$this->configureOptions($resolver);
46+
}
47+
48+
/**
49+
* {@inheritdoc}
50+
*/
51+
public function configureOptions(OptionsResolver $resolver)
4052
{
4153
$resolver
4254
->setDefaults(array(

0 commit comments

Comments
 (0)