8000 [Form] setDefaultOptions() is now coded against OptionsResolverInterface · symfony/symfony@8cae328 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8cae328

Browse files
webmozartwebmozart
committed
[Form] setDefaultOptions() is now coded against OptionsResolverInterface
1 parent 1ecddbc commit 8cae328

36 files changed

+73
-73
lines changed

‎UPGRADE-2.1.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@
520520
* `getAllowedOptionValues`
521521
522522
You should use the newly added `setDefaultOptions` instead, which gives you
523-
access to the OptionsResolver instance and with that a lot more power.
523+
access to the OptionsResolverInterface instance and with that a lot more power.
524524
525525
Before:
526526
@@ -543,7 +543,7 @@
543543
After:
544544
545545
```
546-
public function setDefaultOptions(OptionsResolver $resolver)
546+
public function setDefaultOptions(OptionsResolverInterface $resolver)
547547
{
548548
$resolver->setDefaults(array(
549549
'gender' => 'male',
@@ -575,7 +575,7 @@
575575
After:
576576
577577
```
578-
public function setDefaultOptions(OptionsResolver $resolver)
578+
public function setDefaultOptions(OptionsResolverInterface $resolver)
579579
{
580580
$resolver->setDefaults(array(
581581
'empty_data' => function (Options $options, $value) {
@@ -604,7 +604,7 @@
604604
After:
605605
606606
```
607-
public function setDefaultOptions(OptionsResolver $resolver)
607+
public function setDefaultOptions(OptionsResolverInterface $resolver)
608608
{
609609
$singleControl = function (Options $options) {
610610
return !$options['expanded'];

‎src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php

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

2525
abstract class DoctrineType extends AbstractType
2626
{
@@ -44,7 +44,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
4444
}
4545
}
4646

47-
public function setDefaultOptions(OptionsResolver $resolver)
47+
public function setDefaultOptions(OptionsResolverInterface $resolver)
4848
{
4949
$registry = $this->registry;
5050
$type = $this;

‎src/Symfony/Bridge/Propel1/Form/Type/ModelType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\Form\AbstractType;
1717
use Symfony\Component\Form\FormBuilderInterface;
1818
use Symfony\Component\OptionsResolver\Options;
19-
use Symfony\Component\OptionsResolver\OptionsResolver;
19+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
2020

2121
/**
2222
* ModelType class.
@@ -32,7 +32,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
3232
}
3333
}
3434

35-
public function setDefaultOptions(OptionsResolver $resolver)
35+
public function setDefaultOptions(OptionsResolverInterface $resolver)
3636
{
3737
$choiceList = function (Options $options) {
3838
return new ModelChoiceList(

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginFormType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use Symfony\Component\Form\Event\FilterDataEvent;
1919
use Symfony\Component\HttpFoundation\Request;
2020
use Symfony\Component\Security\Core\SecurityContextInterface;
21-
use Symfony\Component\OptionsResolver\OptionsResolver;
21+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
2222

2323
/**
2424
* Form type for use with the Security component's form-based authentication
@@ -77,7 +77,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
7777
/**
7878
* @see Symfony\Component\Form\AbstractType::setDefaultOptions()
7979
*/
80-
public function setDefaultOptions(OptionsResolver $resolver)
80+
public function setDefaultOptions(OptionsResolverInterface $resolver)
8181
{
8282
/* Note: the form's intention must correspond to that for the form login
8383
* listener in order for the CSRF token to validate successfully.

‎src/Symfony/Component/Form/AbstractType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\Form;
1313

1414
use Symfony\Component\Form\Exception\UnexpectedTypeException;
15-
use Symfony\Component\OptionsResolver\OptionsResolver;
15+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
1616

1717
/**
1818
* @author Bernhard Schussek <bschussek@gmail.com>
@@ -57,7 +57,7 @@ public function createBuilder($name, FormFactoryInterface $factory, array $optio
5757
/**
5858
* {@inheritdoc}
5959
*/
60-
public function setDefaultOptions(OptionsResolver $resolver)
60+
public function setDefaultOptions(OptionsResolverInterface $resolver)
6161
{
6262
$resolver->setDefaults($this->getDefaultOptions());
6363
$resolver->addAllowedValues($this->getAllowedOptionValues());

‎src/Symfony/Component/Form/AbstractTypeExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Component\Form;
1313

14-
use Symfony\Component\OptionsResolver\OptionsResolver;
14+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
1515

1616
/**
1717
* @author Bernhard Schussek <bschussek@gmail.com>
@@ -42,7 +42,7 @@ public function finishView(FormViewInterface $view, FormInterface $form, array $
4242
/**
4343
* {@inheritdoc}
4444
*/
45-
public function setDefaultOptions(OptionsResolver $resolver)
45+
public function setDefaultOptions(OptionsResolverInterface $resolver)
4646
{
4747
$resolver->setDefaults($this->getDefaultOptions());
4848
$resolver->addAllowedValues($this->getAllowedOptionValues());

‎src/Symfony/Component/Form/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ CHANGELOG
9090
* [BC BREAK] FormType::getDefaultOptions() and FormType::getAllowedOptionValues()
9191
don't receive an options array anymore.
9292
* added `setDefaultOptions` to FormTypeInterface and FormTypeExtensionInterface
93-
which accepts an OptionsResolver instance
93+
which accepts an OptionsResolverInterface instance
9494
* deprecated the methods `getDefaultOptions` and `getAllowedOptionValues`
9595
in FormTypeInterface and FormTypeExtensionInterface
9696
* options passed during construction can now be accessed from FormConfigInterface

‎src/Symfony/Component/Form/Extension/Core/Type/BirthdayType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
namespace Symfony\Component\Form\Extension\Core\Type;
1313

1414
use Symfony\Component\Form\AbstractType;
15-
use Symfony\Component\OptionsResolver\OptionsResolver;
15+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
1616

1717
class BirthdayType extends AbstractType
1818
{
1919
/**
2020
* {@inheritdoc}
2121
*/
22-
public function setDefaultOptions(OptionsResolver $resolver)
22+
public function setDefaultOptions(OptionsResolverInterface $resolver)
2323
{
2424
$resolver->setDefaults(array(
2525
'years' => range(date('Y') - 120, date('Y')),

‎src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\Form\FormInterface;
1717
use Symfony\Component\Form\Extension\Core\DataTransformer\BooleanToStringTransformer;
1818
use Symfony\Component\Form\FormViewInterface;
19-
use Symfony\Component\OptionsResolver\OptionsResolver;
19+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
2020

2121
class CheckboxType extends AbstractType
2222
{
@@ -44,7 +44,7 @@ public function buildView(FormViewInterface $view, FormInterface $form, array $o
4444
/**
4545
* {@inheritdoc}
4646
*/
47-
public function setDefaultOptions(OptionsResolver $resolver)
47+
public function setDefaultOptions(OptionsResolverInterface $resolver)
4848
{
4949
$emptyData = function (FormInterface $form, $clientData) {
5050
return $clientData;

‎src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
use Symfony\Component\Form\Extension\Core\DataTransformer\ChoicesToValuesTransformer;
2828
use Symfony\Component\Form\Extension\Core\DataTransformer\ChoicesToBooleanArrayTransformer;
2929
use Symfony\Component\OptionsResolver\Options;
30-
use Symfony\Component\OptionsResolver\OptionsResolver;
30+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
3131

3232
class ChoiceType extends AbstractType
3333
{
@@ -115,7 +115,7 @@ public function finishView(FormViewInterface $view, FormInterface $form, array $
115115
/**
116116
* {@inheritdoc}
117117
*/
118-
public function setDefaultOptions(OptionsResolver $resolver)
118+
public function setDefaultOptions(OptionsResolverInterface $resolver)
119119
{
120120
$choiceList = function (Options $options) {
121121
return new SimpleChoiceList(

‎src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\Form\FormViewInterface;
1717
use Symfony\Component\Form\FormInterface;
1818
use Symfony\Component\Form\Extension\Core\EventListener\ResizeFormListener;
19-
use Symfony\Component\OptionsResolver\OptionsResolver;
19+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
2020

2121
class CollectionType extends AbstractType
2222
{
@@ -71,7 +71,7 @@ public function finishView(FormViewInterface $view, FormInterface $form, array $
7171
/**
7272
* {@inheritdoc}
7373
*/
74-
public function setDefaultOptions(OptionsResolver $resolver)
74+
public function setDefaultOptions(OptionsResolverInterface $resolver)
7575
{
7676
$resolver->setDefaults(array(
7777
'allow_add' => false,

‎src/Symfony/Component/Form/Extension/Core/Type/CountryType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313

1414
use Symfony\Component\Form\AbstractType;
1515
use Symfony\Component\Locale\Locale;
16-
use Symfony\Component\OptionsResolver\OptionsResolver;
16+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
1717

1818
class CountryType extends AbstractType
1919
{
2020
/**
2121
* {@inheritdoc}
2222
*/
23-
public function setDefaultOptions(OptionsResolver $resolver)
23+
public function setDefaultOptions(OptionsResolverInterface $resolver)
2424
{
2525
$resolver->setDefaults(array(
2626
'choices' => Locale::getDisplayCountries(\Locale::getDefault()),

‎src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
2323
use Symfony\Component\Form\Extension\Core\DataTransformer\ArrayToPartsTransformer;
2424
use Symfony\Component\OptionsResolver\Options;
25-
use Symfony\Component\OptionsResolver\OptionsResolver;
25+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
2626

2727
class DateTimeType extends AbstractType
2828
{
@@ -128,7 +128,7 @@ public function buildView(FormViewInterface $view, FormInterface $form, array $o
128128
/**
129129
* {@inheritdoc}
130130
*/
131-
public function setDefaultOptions(OptionsResolver $resolver)
131+
public function setDefaultOptions(OptionsResolverInterface $resolver)
132132
{
133133
$singleControl = function (Options $options) {
134134
return $options['widget'] === 'single_text';

‎src/Symfony/Component/Form/Extension/Core/Type/DateType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
2323
use Symfony\Component\Form\ReversedTransformer;
2424
use Symfony\Component\OptionsResolver\Options;
25-
use Symfony\Component\OptionsResolver\OptionsResolver;
25+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
2626

2727
class DateType extends AbstractType
2828
{
@@ -163,7 +163,7 @@ public function finishView(FormViewInterface $view, FormInterface $form, array $
163163
/**
164164
* {@inheritdoc}
165165
*/
166-
public function setDefaultOptions(OptionsResolver $resolver)
166+
public function setDefaultOptions(OptionsResolverInterface $resolver)
167167
{
168168
$singleControl = function (Options $options) {
169169
return $options['widget'] === 'single_text';

‎src/Symfony/Component/Form/Extension/Core/Type/FileType.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\FormViewInterface;
17-
use Symfony\Component\OptionsResolver\OptionsResolver;
17+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
1818

1919
class FileType extends AbstractType
2020
{
@@ -42,7 +42,7 @@ public function finishView(FormViewInterface $view, FormInterface $form, array $
4242
/**
4343
* {@inheritdoc}
4444
*/
45-
public function setDefaultOptions(OptionsResolver $resolver)
45+
public function setDefaultOptions(OptionsResolverInterface $resolver)
4646
{
4747
$resolver->setDefaults(array(
4848
'single_control' => true,

‎src/Symfony/Component/Form/Extension/Core/Type/FormType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
use Symfony\Component\EventDispatcher\EventDispatcher;
2424
use Symfony\Component\Form\Exception\FormException;
2525
use Symfony\Component\OptionsResolver\Options;
26-
use Symfony\Component\OptionsResolver\OptionsResolver;
26+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
2727

2828
class FormType extends AbstractType
2929
{
@@ -133,7 +133,7 @@ public function finishView(FormViewInterface $view, FormInterface $form, array $
133133
/**
134134
* {@inheritdoc}
135135
*/
136-
public function setDefaultOptions(OptionsResolver $resolver)
136+
public function setDefaultOptions(OptionsResolverInterface $resolver)
137137
{
138138
// Derive "data_class" option from passed "data" object
139139
$dataClass = function (Options $options) {

‎src/Symfony/Component/Form/Extension/Core/Type/HiddenType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
namespace Symfony\Component\Form\Extension\Core\Type;
1313

1414
use Symfony\Component\Form\AbstractType;
15-
use Symfony\Component\OptionsResolver\OptionsResolver;
15+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
1616

1717
class HiddenType extends AbstractType
1818
{
1919
/**
2020
* {@inheritdoc}
2121
*/
22-
public function setDefaultOptions(OptionsResolver $resolver)
22+
public function setDefaultOptions(OptionsResolverInterface $resolver)
2323
{
2424
$resolver->setDefaults(array(
2525
// hidden fields cannot have a required attribute

‎src/Symfony/Component/Form/Extension/Core/Type/IntegerType.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\FormBuilderInterface;
1616
use Symfony\Component\Form\Extension\Core\DataTransformer\IntegerToLocalizedStringTransformer;
17-
use Symfony\Component\OptionsResolver\OptionsResolver;
17+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
1818

1919
class IntegerType extends AbstractType
2020
{
@@ -34,7 +34,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
3434
/**
3535
* {@inheritdoc}
3636
*/
37-
public function setDefaultOptions(OptionsResolver $resolver)
37+
public function setDefaultOptions(OptionsResolverInterface $resolver)
3838
{
3939
$resolver->setDefaults(array(
4040
// default precision is locale specific (usually around 3)

‎src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313

1414
use Symfony\Component\Form\AbstractType;
1515
use Symfony\Component\Locale\Locale;
16-
use Symfony\Component\OptionsResolver\OptionsResolver;
16+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
1717

1818
class LanguageType extends AbstractType
1919
{
2020
/**
2121
* {@inheritdoc}
2222
*/
23-
public function setDefaultOptions(OptionsResolver $resolver)
23+
public function setDefaultOptions(OptionsResolverInterface $resolver)
2424
{
2525
$resolver->setDefaults(array(
2626
'choices' => Locale::getDisplayLanguages(\Locale::getDefault()),

‎src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313

1414
use Symfony\Component\Form\AbstractType;
1515
use Symfony\Component\Locale\Locale;
16-
use Symfony\Component\OptionsResolver\OptionsResolver;
16+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
1717

1818
class LocaleType extends AbstractType
1919
{
2020
/**
2121
* {@inheritdoc}
2222
*/
23-
public function setDefaultOptions(OptionsResolver $resolver)
23+
public function setDefaultOptions(OptionsResolverInterface $resolver)
2424
{
2525
$resolver->setDefaults(array(
2626
'choices' => Locale::getDisplayLocales(\Locale::getDefault()),

‎src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\Form\FormBuilderInterface;
1717
use Symfony\Component\Form\Extension\Core\DataTransformer\MoneyToLocalizedStringTransformer;
1818
use Symfony\Component\Form\FormViewInterface;
19-
use Symfony\Component\OptionsResolver\OptionsResolver;
19+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
2020

2121
class MoneyType extends AbstractType
2222
{
@@ -48,7 +48,7 @@ public function buildView(FormViewInterface $view, FormInterface $form, array $o
4848
/**
4949
* {@inheritdoc}
5050
*/
51-
public function setDefaultOptions(OptionsResolver $resolver)
51+
public function setDefaultOptions(OptionsResolverInterface $resolver)
5252
{
5353
$resolver->setDefaults(array(
5454
'precision' => 2,

‎src/Symfony/Component/Form/Extension/Core/Type/NumberType.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\FormBuilderInterface;
1616
use Symfony\Component\Form\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer;
17-
use Symfony\Component\OptionsResolver\OptionsResolver;
17+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
1818

1919
class NumberType extends AbstractType
2020
{
@@ -33,7 +33,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
3333
/**
3434
* {@inheritdoc}
3535
*/
36-
public function setDefaultOptions(OptionsResolver $resolver)
36+
public function setDefaultOptions(OptionsResolverInterface $resolver)
3737
{
3838
$resolver->setDefaults(array(
3939
// default precision is locale specific (usually around 3)

0 commit comments

Comments
 (0)
0