Skip to content

Commit 524f9d3

Browse files
committed
[BC] Remove deprecated code for Symfony 2.7
1 parent db08bc3 commit 524f9d3

File tree

2 files changed

+22
-14
lines changed

2 files changed

+22
-14
lines changed

Form/Extension/HelpTypeExtension.php

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,26 @@
33
namespace Snowcap\BootstrapBundle\Form\Extension;
44

55
use Symfony\Component\Form\AbstractTypeExtension;
6-
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
6+
use Symfony\Component\OptionsResolver\OptionsResolver;
77
use Symfony\Component\Form\FormView;
88
use Symfony\Component\Form\FormInterface;
99

10+
/**
11+
* Class HelpTypeExtension
12+
* @package Snowcap\BootstrapBundle\Form\Extension
13+
*/
1014
class HelpTypeExtension extends AbstractTypeExtension
1115
{
1216
/**
13-
* @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
17+
* @param \Symfony\Component\OptionsResolver\OptionsResolver $resolver
1418
*/
15-
public function setDefaultOptions(OptionsResolverInterface $resolver)
19+
public function configureOptions(OptionsResolver $resolver)
1620
{
1721
$resolver
18-
->setOptional(array('help_block', 'help_inline'))
19-
->setAllowedTypes(array(
20-
'help_block' => 'string',
21-
'help_inline' => 'string',
22-
));
22+
->setDefined(array('help_block', 'help_inline'))
23+
->setAllowedTypes('help_block', 'string')
24+
->setAllowedTypes('help_inline', 'string')
25+
;
2326
}
2427

2528
public function buildView(FormView $view, FormInterface $form, array $options)

Form/Extension/PrependAndAppendTypeExtension.php

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33
namespace Snowcap\BootstrapBundle\Form\Extension;
44

55
use Symfony\Component\Form\AbstractTypeExtension;
6-
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
6+
use Symfony\Component\OptionsResolver\OptionsResolver;
77
use Symfony\Component\Form\FormView;
88
use Symfony\Component\Form\FormInterface;
99

10+
/**
11+
* Class PrependAndAppendTypeExtension
12+
* @package Snowcap\BootstrapBundle\Form\Extension
13+
*/
1014
class PrependAndAppendTypeExtension extends AbstractTypeExtension
1115
{
1216
/**
@@ -20,13 +24,14 @@ class PrependAndAppendTypeExtension extends AbstractTypeExtension
2024
);
2125

2226
/**
23-
* @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
27+
* @param \Symfony\Component\OptionsResolver\OptionsResolver $resolver
2428
*/
25-
public function setDefaultOptions(OptionsResolverInterface $resolver)
29+
public function configureOptions(OptionsResolver $resolver)
2630
{
27-
$resolver
28-
->setOptional($this->prependAndAppendOptions)
29-
->setAllowedTypes(array_combine($this->prependAndAppendOptions, array_fill(0, 4, 'string')));
31+
$resolver->setDefined($this->prependAndAppendOptions);
32+
foreach ($this->prependAndAppendOptions as $option) {
33+
$resolver->setAllowedTypes($option, 'string');
34+
}
3035
}
3136

3237
/**

0 commit comments

Comments
 (0)