Skip to content

Commit 5d660a9

Browse files
committed
Remove Symfony 2.7 deprecated methods
1 parent 700fe75 commit 5d660a9

9 files changed

Lines changed: 21 additions & 25 deletions

Form/Type/EntityNormalizerTrait.php

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Bundle\FrameworkBundle\Routing\Router;
1616
use Symfony\Component\Form\Exception\InvalidConfigurationException;
1717
use Symfony\Component\OptionsResolver\Options;
18-
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
18+
use Symfony\Component\OptionsResolver\OptionsResolver;
1919

2020
trait EntityNormalizerTrait
2121
{
@@ -88,7 +88,7 @@ public function getDefaultUrl(Options $options, Router $router)
8888
return null;
8989
}
9090

91-
public function addCommonDefaultOptions(OptionsResolverInterface $resolver, ManagerRegistry $registry, Router $router)
91+
public function addCommonDefaultOptions(OptionsResolver $resolver, ManagerRegistry $registry, Router $router)
9292
{
9393
$resolver->setDefaults(
9494
array(
@@ -117,12 +117,8 @@ public function addCommonDefaultOptions(OptionsResolverInterface $resolver, Mana
117117
$resolver->setAllowedTypes('url', array('string'));
118118
$resolver->setAllowedTypes('route_params', array('array'));
119119

120-
$resolver->setNormalizers(
121-
array(
122-
'em' => $this->getEmNormalizer($registry),
123-
'query_builder' => $this->getQueryBuilderNormalizer(),
124-
'identifier' => $this->getIdentifierNormalizer(),
125-
)
126-
);
120+
$resolver->setNormalizer('em', $this->getEmNormalizer($registry));
121+
$resolver->setNormalizer('query_builder', $this->getQueryBuilderNormalizer());
122+
$resolver->setNormalizer('identifier', $this->getIdentifierNormalizer());
127123
}
128124
}

Form/Type/JqueryAutocompleteEntityAjaxType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
use Symfony\Component\Form\FormView;
2121
use Symfony\Component\Form\ReversedTransformer;
2222
use Symfony\Component\OptionsResolver\Options;
23-
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
23+
use Symfony\Component\OptionsResolver\OptionsResolver;
2424

2525
class JqueryAutocompleteEntityAjaxType extends AbstractType
2626
{
@@ -89,7 +89,7 @@ public function getParent()
8989
return 'form';
9090
}
9191

92-
public function setDefaultOptions(OptionsResolverInterface $resolver)
92+
public function configureOptions(OptionsResolver $resolver)
9393
{
9494
$resolver->setDefaults(
9595
array(

Form/Type/JqueryDatePicker.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
use Symfony\Component\Form\FormInterface;
2121
use Symfony\Component\Form\FormView;
2222
use Symfony\Component\Form\ReversedTransformer;
23-
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
23+
use Symfony\Component\OptionsResolver\OptionsResolver;
2424

2525
class JqueryDatePicker extends AbstractType
2626
{
@@ -87,7 +87,7 @@ public function getParent()
8787
return 'form';
8888
}
8989

90-
public function setDefaultOptions(OptionsResolverInterface $resolver)
90+
public function configureOptions(OptionsResolver $resolver)
9191
{
9292
$resolver->setDefaults(
9393
array(

Form/Type/RecaptchaType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\Form\AbstractType;
1515
use Symfony\Component\Form\FormInterface;
1616
use Symfony\Component\Form\FormView;
17-
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
17+
use Symfony\Component\OptionsResolver\OptionsResolver;
1818

1919
class RecaptchaType extends AbstractType
2020
{
@@ -63,7 +63,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
6363
$view->vars['options'] = $options['options'];
6464
}
6565

66-
public function setDefaultOptions(OptionsResolverInterface $resolver)
66+
public function configureOptions(OptionsResolver $resolver)
6767
{
6868
$resolver->setDefaults(
6969
array(

Form/Type/Select2/AbstractSelect2Type.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
use Symfony\Component\Form\AbstractType;
1414
use Symfony\Component\Form\FormInterface;
1515
use Symfony\Component\Form\FormView;
16-
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
16+
use Symfony\Component\OptionsResolver\OptionsResolver;
1717

1818
abstract class AbstractSelect2Type extends AbstractType
1919
{
@@ -29,7 +29,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
2929
/**
3030
* {@inheritdoc}
3131
*/
32-
public function setDefaultOptions(OptionsResolverInterface $resolver)
32+
public function configureOptions(OptionsResolver $resolver)
3333
{
3434
$resolver->setDefaults(
3535
array(

Form/Type/Select2/Select2EntityAjaxType.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
use Symfony\Component\Form\FormView;
2222
use Symfony\Component\Form\ReversedTransformer;
2323
use Symfony\Component\OptionsResolver\Options;
24-
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
24+
use Symfony\Component\OptionsResolver\OptionsResolver;
2525
use Symfony\Component\PropertyAccess\PropertyAccess;
2626

2727
class Select2EntityAjaxType extends AbstractSelect2Type
@@ -155,9 +155,9 @@ protected function extractLabel($object, $property)
155155
/**
156156
* {@inheritdoc}
157157
*/
158-
public function setDefaultOptions(OptionsResolverInterface $resolver)
158+
public function configureOptions(OptionsResolver $resolver)
159159
{
160-
parent::setDefaultOptions($resolver);
160+
parent::configureOptions($resolver);
161161

162162
$resolver->setDefaults(
163163
array(

Form/Type/TinyMCEType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\Form\AbstractType;
1515
use Symfony\Component\Form\FormInterface;
1616
use Symfony\Component\Form\FormView;
17-
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
17+
use Symfony\Component\OptionsResolver\OptionsResolver;
1818

1919
class TinyMCEType extends AbstractType
2020
{
@@ -37,7 +37,7 @@ public function getParent()
3737
return 'textarea';
3838
}
3939

40-
public function setDefaultOptions(OptionsResolverInterface $resolver)
40+
public function configureOptions(OptionsResolver $resolver)
4141
{
4242
$resolver->setDefaults(
4343
array(

Form/Type/TokenInputEntitiesAjaxType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
use Symfony\Component\Form\FormView;
2222
use Symfony\Component\Form\ReversedTransformer;
2323
use Symfony\Component\OptionsResolver\Options;
24-
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
24+
use Symfony\Component\OptionsResolver\OptionsResolver;
2525

2626
class TokenInputEntitiesAjaxType extends AbstractType
2727
{
@@ -100,7 +100,7 @@ public function getParent()
100100
return 'form';
101101
}
102102

103-
public function setDefaultOptions(OptionsResolverInterface $resolver)
103+
public function configureOptions(OptionsResolver $resolver)
104104
{
105105
$resolver->setDefaults(
106106
array(

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
],
1212
"require": {
13-
"symfony/framework-bundle": ">=2.6.0, <2.8",
13+
"symfony/framework-bundle": ">=2.7.0, <2.8",
1414
"twig/twig": "*",
1515
"doctrine/orm": "*",
1616
"doctrine/doctrine-bundle": "*",

0 commit comments

Comments
 (0)