From f30e4b21bf10d3b3a50600d1de8b2e620fdc4a27 Mon Sep 17 00:00:00 2001 From: David Maicher Date: Thu, 27 Aug 2020 19:11:59 +0200 Subject: [PATCH] Cleanup dead setDefaultOptions(..) methods --- .phpstan/phpstan-baseline.neon | 114 ------------------ psalm-baseline.xml | 91 -------------- src/Form/Extension/ChoiceTypeExtension.php | 11 -- .../Field/Type/FormTypeFieldExtension.php | 11 -- .../MopaCompatibilityTypeFieldExtension.php | 11 -- src/Form/Type/AclMatrixType.php | 11 -- src/Form/Type/AdminType.php | 11 -- src/Form/Type/ChoiceFieldMaskType.php | 11 -- src/Form/Type/Filter/ChoiceType.php | 11 -- src/Form/Type/Filter/DateRangeType.php | 8 -- src/Form/Type/Filter/DateTimeRangeType.php | 11 -- src/Form/Type/Filter/DateTimeType.php | 11 -- src/Form/Type/Filter/DateType.php | 11 -- src/Form/Type/Filter/DefaultType.php | 11 -- src/Form/Type/Filter/NumberType.php | 11 -- src/Form/Type/ModelAutocompleteType.php | 11 -- src/Form/Type/ModelHiddenType.php | 11 -- src/Form/Type/ModelListType.php | 11 -- src/Form/Type/ModelReferenceType.php | 12 -- src/Form/Type/ModelType.php | 11 -- 20 files changed, 401 deletions(-) diff --git a/.phpstan/phpstan-baseline.neon b/.phpstan/phpstan-baseline.neon index f4f21d4d1f..7a1ba64476 100644 --- a/.phpstan/phpstan-baseline.neon +++ b/.phpstan/phpstan-baseline.neon @@ -223,120 +223,6 @@ parameters: count: 1 path: ../src/Block/AdminStatsBlockService.php - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\#1 \\$resolver of method .+(Type|Extension)\\:\\:configureOptions\\(\\) expects Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver, Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface given\\.$#" - count: 17 - path: ../src/Form/* - - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\$resolver of method Sonata\\\\AdminBundle\\\\Form\\\\Extension\\\\Field\\\\Type\\\\FormTypeFieldExtension\\:\\:setDefaultOptions\\(\\) has invalid typehint type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#" - count: 1 - path: ../src/Form/Extension/Field/Type/FormTypeFieldExtension.php - - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\$resolver of method Sonata\\\\AdminBundle\\\\Form\\\\Extension\\\\Field\\\\Type\\\\MopaCompatibilityTypeFieldExtension\\:\\:setDefaultOptions\\(\\) has invalid typehint type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#" - count: 1 - path: ../src/Form/Extension/Field/Type/MopaCompatibilityTypeFieldExtension.php - - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\$resolver of method Sonata\\\\AdminBundle\\\\Form\\\\Type\\\\AclMatrixType\\:\\:setDefaultOptions\\(\\) has invalid typehint type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#" - count: 1 - path: ../src/Form/Type/AclMatrixType.php - - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\$resolver of method Sonata\\\\AdminBundle\\\\Form\\\\Type\\\\AdminType\\:\\:setDefaultOptions\\(\\) has invalid typehint type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#" - count: 1 - path: ../src/Form/Type/AdminType.php - - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\$resolver of method Sonata\\\\AdminBundle\\\\Form\\\\Type\\\\ChoiceFieldMaskType\\:\\:setDefaultOptions\\(\\) has invalid typehint type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#" - count: 1 - path: ../src/Form/Type/ChoiceFieldMaskType.php - - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\$resolver of method Sonata\\\\AdminBundle\\\\Form\\\\Type\\\\Filter\\\\ChoiceType\\:\\:setDefaultOptions\\(\\) has invalid typehint type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#" - count: 1 - path: ../src/Form/Type/Filter/ChoiceType.php - - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\$resolver of method Sonata\\\\AdminBundle\\\\Form\\\\Type\\\\Filter\\\\DateRangeType\\:\\:setDefaultOptions\\(\\) has invalid typehint type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#" - count: 1 - path: ../src/Form/Type/Filter/DateRangeType.php - - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\$resolver of method Sonata\\\\AdminBundle\\\\Form\\\\Type\\\\Filter\\\\DateTimeRangeType\\:\\:setDefaultOptions\\(\\) has invalid typehint type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#" - count: 1 - path: ../src/Form/Type/Filter/DateTimeRangeType.php - - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\$resolver of method Sonata\\\\AdminBundle\\\\Form\\\\Type\\\\Filter\\\\DateTimeType\\:\\:setDefaultOptions\\(\\) has invalid typehint type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#" - count: 1 - path: ../src/Form/Type/Filter/DateTimeType.php - - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\$resolver of method Sonata\\\\AdminBundle\\\\Form\\\\Type\\\\Filter\\\\DateType\\:\\:setDefaultOptions\\(\\) has invalid typehint type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#" - count: 1 - path: ../src/Form/Type/Filter/DateType.php - - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\$resolver of method Sonata\\\\AdminBundle\\\\Form\\\\Type\\\\Filter\\\\DefaultType\\:\\:setDefaultOptions\\(\\) has invalid typehint type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#" - count: 1 - path: ../src/Form/Type/Filter/DefaultType.php - - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\$resolver of method Sonata\\\\AdminBundle\\\\Form\\\\Type\\\\Filter\\\\NumberType\\:\\:setDefaultOptions\\(\\) has invalid typehint type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#" - count: 1 - path: ../src/Form/Type/Filter/NumberType.php - - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\$resolver of method Sonata\\\\AdminBundle\\\\Form\\\\Type\\\\ModelAutocompleteType\\:\\:setDefaultOptions\\(\\) has invalid typehint type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#" - count: 1 - path: ../src/Form/Type/ModelAutocompleteType.php - - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\$resolver of method Sonata\\\\AdminBundle\\\\Form\\\\Type\\\\ModelHiddenType\\:\\:setDefaultOptions\\(\\) has invalid typehint type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#" - count: 1 - path: ../src/Form/Type/ModelHiddenType.php - - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\$resolver of method Sonata\\\\AdminBundle\\\\Form\\\\Type\\\\ModelListType\\:\\:setDefaultOptions\\(\\) has invalid typehint type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#" - count: 1 - path: ../src/Form/Type/ModelListType.php - - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\$resolver of method Sonata\\\\AdminBundle\\\\Form\\\\Type\\\\ModelReferenceType\\:\\:setDefaultOptions\\(\\) has invalid typehint type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#" - count: 1 - path: ../src/Form/Type/ModelReferenceType.php - - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\$resolver of method Sonata\\\\AdminBundle\\\\Form\\\\Type\\\\ModelType\\:\\:setDefaultOptions\\(\\) has invalid typehint type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#" - count: 1 - path: ../src/Form/Type/ModelType.php - - - - # will be fixed in v4. Currently BC break - message: "#^Parameter \\$resolver of method Sonata\\\\AdminBundle\\\\Form\\\\Extension\\\\ChoiceTypeExtension\\:\\:setDefaultOptions\\(\\) has invalid typehint type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#" - count: 1 - path: ../src/Form/Extension/ChoiceTypeExtension.php - - # will be fixed in v4. The file won't exist message: "#^Call to static method load\\(\\) on an unknown class Symfony\\\\Component\\\\ClassLoader\\\\ClassCollectionLoader\\.$#" diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 7de496bcf6..6717b844a4 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -57,97 +57,6 @@ - - - - OptionsResolverInterface - - - - - OptionsResolverInterface - - - - - OptionsResolverInterface - - - - - OptionsResolverInterface - - - - - OptionsResolverInterface - - - - - OptionsResolverInterface - - - - - OptionsResolverInterface - - - - - OptionsResolverInterface - - - - - OptionsResolverInterface - - - - - OptionsResolverInterface - - - - - OptionsResolverInterface - - - - - OptionsResolverInterface - - - - - OptionsResolverInterface - - - - - OptionsResolverInterface - - - - - OptionsResolverInterface - - - - - OptionsResolverInterface - - - - - OptionsResolverInterface - - - - - OptionsResolverInterface - - diff --git a/src/Form/Extension/ChoiceTypeExtension.php b/src/Form/Extension/ChoiceTypeExtension.php index c06f23901b..9be85544ec 100644 --- a/src/Form/Extension/ChoiceTypeExtension.php +++ b/src/Form/Extension/ChoiceTypeExtension.php @@ -18,7 +18,6 @@ use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * @final since sonata-project/admin-bundle 3.52 @@ -27,16 +26,6 @@ */ class ChoiceTypeExtension extends AbstractTypeExtension { - /** - * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+. - * - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); - } - public function configureOptions(OptionsResolver $resolver) { $optionalOptions = ['sortable']; diff --git a/src/Form/Extension/Field/Type/FormTypeFieldExtension.php b/src/Form/Extension/Field/Type/FormTypeFieldExtension.php index f558395ada..3f97acc649 100644 --- a/src/Form/Extension/Field/Type/FormTypeFieldExtension.php +++ b/src/Form/Extension/Field/Type/FormTypeFieldExtension.php @@ -21,7 +21,6 @@ use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * @final since sonata-project/admin-bundle 3.52 @@ -168,16 +167,6 @@ public static function getExtendedTypes() return [FormType::class]; } - /** - * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+. - * - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); - } - public function configureOptions(OptionsResolver $resolver) { $resolver diff --git a/src/Form/Extension/Field/Type/MopaCompatibilityTypeFieldExtension.php b/src/Form/Extension/Field/Type/MopaCompatibilityTypeFieldExtension.php index fcfa3804f4..313ef79a57 100644 --- a/src/Form/Extension/Field/Type/MopaCompatibilityTypeFieldExtension.php +++ b/src/Form/Extension/Field/Type/MopaCompatibilityTypeFieldExtension.php @@ -18,7 +18,6 @@ use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * This class is built to allow AdminInterface to work properly @@ -30,16 +29,6 @@ */ class MopaCompatibilityTypeFieldExtension extends AbstractTypeExtension { - /** - * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+. - * - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); - } - public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ diff --git a/src/Form/Type/AclMatrixType.php b/src/Form/Type/AclMatrixType.php index f3bff99d36..03d70d0b81 100644 --- a/src/Form/Type/AclMatrixType.php +++ b/src/Form/Type/AclMatrixType.php @@ -18,7 +18,6 @@ use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Security\Core\User\UserInterface; /** @@ -45,16 +44,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) } } - /** - * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+. - * - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); - } - public function configureOptions(OptionsResolver $resolver) { $resolver->setRequired(['permissions', 'acl_value']); diff --git a/src/Form/Type/AdminType.php b/src/Form/Type/AdminType.php index e6729110bc..c7444d53bb 100644 --- a/src/Form/Type/AdminType.php +++ b/src/Form/Type/AdminType.php @@ -25,7 +25,6 @@ use Symfony\Component\Form\FormView; use Symfony\Component\OptionsResolver\Options; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\PropertyAccess\Exception\NoSuchIndexException; use Symfony\Component\PropertyAccess\PropertyAccessor; @@ -131,16 +130,6 @@ public function buildView(FormView $view, FormInterface $form, array $options) $view->vars['btn_catalogue'] = $options['btn_catalogue']; } - /** - * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+. - * - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); - } - public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ diff --git a/src/Form/Type/ChoiceFieldMaskType.php b/src/Form/Type/ChoiceFieldMaskType.php index 20208c1c58..0749f4355e 100644 --- a/src/Form/Type/ChoiceFieldMaskType.php +++ b/src/Form/Type/ChoiceFieldMaskType.php @@ -18,7 +18,6 @@ use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * @final since sonata-project/admin-bundle 3.52 @@ -49,16 +48,6 @@ public function buildView(FormView $view, FormInterface $form, array $options) parent::buildView($view, $form, $options); } - /** - * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+. - * - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); - } - public function configureOptions(OptionsResolver $resolver) { parent::configureOptions($resolver); diff --git a/src/Form/Type/Filter/ChoiceType.php b/src/Form/Type/Filter/ChoiceType.php index 8e494fcd8d..91638fb931 100644 --- a/src/Form/Type/Filter/ChoiceType.php +++ b/src/Form/Type/Filter/ChoiceType.php @@ -18,7 +18,6 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType as FormChoiceType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Translation\TranslatorInterface; /** @@ -80,16 +79,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } - /** - * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+. - * - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); - } - public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ diff --git a/src/Form/Type/Filter/DateRangeType.php b/src/Form/Type/Filter/DateRangeType.php index 6cbf47cced..01825fc1c0 100644 --- a/src/Form/Type/Filter/DateRangeType.php +++ b/src/Form/Type/Filter/DateRangeType.php @@ -18,7 +18,6 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Translation\TranslatorInterface; /** @@ -75,13 +74,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } - // NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+ - - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); - } - public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ diff --git a/src/Form/Type/Filter/DateTimeRangeType.php b/src/Form/Type/Filter/DateTimeRangeType.php index d48d2bea4c..66f5309c56 100644 --- a/src/Form/Type/Filter/DateTimeRangeType.php +++ b/src/Form/Type/Filter/DateTimeRangeType.php @@ -18,7 +18,6 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Translation\TranslatorInterface; /** @@ -75,16 +74,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } - /** - * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+. - * - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); - } - public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ diff --git a/src/Form/Type/Filter/DateTimeType.php b/src/Form/Type/Filter/DateTimeType.php index 1485d7a7f3..4bb209c850 100644 --- a/src/Form/Type/Filter/DateTimeType.php +++ b/src/Form/Type/Filter/DateTimeType.php @@ -18,7 +18,6 @@ use Symfony\Component\Form\Extension\Core\Type\DateTimeType as FormDateTimeType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Translation\TranslatorInterface; /** @@ -100,16 +99,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } - /** - * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+. - * - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); - } - public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ diff --git a/src/Form/Type/Filter/DateType.php b/src/Form/Type/Filter/DateType.php index fd60a8cc3f..24cefd185e 100644 --- a/src/Form/Type/Filter/DateType.php +++ b/src/Form/Type/Filter/DateType.php @@ -18,7 +18,6 @@ use Symfony\Component\Form\Extension\Core\Type\DateType as FormDateType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Translation\TranslatorInterface; /** @@ -100,16 +99,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } - /** - * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+. - * - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); - } - public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ diff --git a/src/Form/Type/Filter/DefaultType.php b/src/Form/Type/Filter/DefaultType.php index 1993c58b97..d0e60d306b 100644 --- a/src/Form/Type/Filter/DefaultType.php +++ b/src/Form/Type/Filter/DefaultType.php @@ -18,7 +18,6 @@ use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * @final since sonata-project/admin-bundle 3.52 @@ -50,16 +49,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } - /** - * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+. - * - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); - } - public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ diff --git a/src/Form/Type/Filter/NumberType.php b/src/Form/Type/Filter/NumberType.php index 96c43702d5..4da94e8a31 100644 --- a/src/Form/Type/Filter/NumberType.php +++ b/src/Form/Type/Filter/NumberType.php @@ -18,7 +18,6 @@ use Symfony\Component\Form\Extension\Core\Type\NumberType as FormNumberType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Translation\TranslatorInterface; /** @@ -90,16 +89,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } - /** - * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+. - * - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); - } - public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ diff --git a/src/Form/Type/ModelAutocompleteType.php b/src/Form/Type/ModelAutocompleteType.php index 3a40a4b66c..0db01b20ed 100644 --- a/src/Form/Type/ModelAutocompleteType.php +++ b/src/Form/Type/ModelAutocompleteType.php @@ -22,7 +22,6 @@ use Symfony\Component\Form\FormView; use Symfony\Component\OptionsResolver\Options; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * This type defines a standard text field with autocomplete feature. @@ -94,16 +93,6 @@ public function buildView(FormView $view, FormInterface $form, array $options) } } - /** - * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+. - * - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); - } - public function configureOptions(OptionsResolver $resolver) { $compound = static function (Options $options) { diff --git a/src/Form/Type/ModelHiddenType.php b/src/Form/Type/ModelHiddenType.php index f4d4fc3a98..9135bacd70 100644 --- a/src/Form/Type/ModelHiddenType.php +++ b/src/Form/Type/ModelHiddenType.php @@ -18,7 +18,6 @@ use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * This type define a standard hidden field, that stored id to a object. @@ -36,16 +35,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) ; } - /** - * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+. - * - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); - } - public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ diff --git a/src/Form/Type/ModelListType.php b/src/Form/Type/ModelListType.php index 981ae5e0fb..9235c3fe4f 100644 --- a/src/Form/Type/ModelListType.php +++ b/src/Form/Type/ModelListType.php @@ -20,7 +20,6 @@ use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * This type can be used to select one associated model from a list. @@ -66,16 +65,6 @@ public function buildView(FormView $view, FormInterface $form, array $options) $view->vars['btn_catalogue'] = $options['btn_catalogue']; } - /** - * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+. - * - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); - } - public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ diff --git a/src/Form/Type/ModelReferenceType.php b/src/Form/Type/ModelReferenceType.php index b151b67b6f..b654473e8f 100644 --- a/src/Form/Type/ModelReferenceType.php +++ b/src/Form/Type/ModelReferenceType.php @@ -18,7 +18,6 @@ use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * @final since sonata-project/admin-bundle 3.52 @@ -32,17 +31,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder->addModelTransformer(new ModelToIdTransformer($options['model_manager'], $options['class'])); } - /** - * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+. - * - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - \assert($resolver instanceof OptionsResolver); - $this->configureOptions($resolver); - } - public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ diff --git a/src/Form/Type/ModelType.php b/src/Form/Type/ModelType.php index 6b5890c901..639513d07b 100644 --- a/src/Form/Type/ModelType.php +++ b/src/Form/Type/ModelType.php @@ -24,7 +24,6 @@ use Symfony\Component\Form\FormView; use Symfony\Component\OptionsResolver\Options; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\PropertyAccess\PropertyAccessorInterface; /** @@ -72,16 +71,6 @@ public function buildView(FormView $view, FormInterface $form, array $options) $view->vars['btn_catalogue'] = $options['btn_catalogue']; } - /** - * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+. - * - * {@inheritdoc} - */ - public function setDefaultOptions(OptionsResolverInterface $resolver) - { - $this->configureOptions($resolver); - } - public function configureOptions(OptionsResolver $resolver) { $options = [];