From be6d3493ede1ac3633c9a6b61500b0a707b01947 Mon Sep 17 00:00:00 2001 From: nobohan Date: Wed, 4 Apr 2018 17:03:32 +0200 Subject: [PATCH] fix deprecations: setDefaultOptions -> configureOptions --- Form/AccompanyingPeriodType.php | 6 +++--- Form/CreationPersonType.php | 2 +- Form/PersonType.php | 2 +- Form/Type/ClosingMotiveType.php | 17 +++++++++-------- Form/Type/GenderType.php | 9 ++------- Form/Type/Select2MaritalStatusType.php | 4 ++-- 6 files changed, 18 insertions(+), 22 deletions(-) diff --git a/Form/AccompanyingPeriodType.php b/Form/AccompanyingPeriodType.php index 7fd521b4d..4ccdef6ce 100644 --- a/Form/AccompanyingPeriodType.php +++ b/Form/AccompanyingPeriodType.php @@ -4,7 +4,7 @@ namespace Chill\PersonBundle\Form; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormView; @@ -59,9 +59,9 @@ class AccompanyingPeriodType extends AbstractType } /** - * @param OptionsResolverInterface $resolver + * @param OptionsResolver $resolver */ - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults(array( 'data_class' => 'Chill\PersonBundle\Entity\AccompanyingPeriod' diff --git a/Form/CreationPersonType.php b/Form/CreationPersonType.php index e17c478ea..da0b6a90b 100644 --- a/Form/CreationPersonType.php +++ b/Form/CreationPersonType.php @@ -88,7 +88,7 @@ class CreationPersonType extends AbstractType ->add('lastName') ->add('birthdate', DateType::class, array('required' => false, 'widget' => 'single_text', 'format' => 'dd-MM-yyyy')) - ->add('gender', new GenderType(), array( + ->add('gender', GenderType::class, array( 'required' => true, 'empty_value' => null )) ->add('creation_date', DateType::class, array( diff --git a/Form/PersonType.php b/Form/PersonType.php index e57b3472f..1ab9cb8dd 100644 --- a/Form/PersonType.php +++ b/Form/PersonType.php @@ -64,7 +64,7 @@ class PersonType extends AbstractType ->add('firstName') ->add('lastName') ->add('birthdate', DateType::class, array('required' => false, 'widget' => 'single_text', 'format' => 'dd-MM-yyyy')) - ->add('gender', new GenderType(), array( + ->add('gender', GenderType::class, array( 'required' => true )) ->add('memo', TextareaType::class, array('required' => false)) diff --git a/Form/Type/ClosingMotiveType.php b/Form/Type/ClosingMotiveType.php index a041818f2..faaf0c6f5 100644 --- a/Form/Type/ClosingMotiveType.php +++ b/Form/Type/ClosingMotiveType.php @@ -5,6 +5,7 @@ namespace Chill\PersonBundle\Form\Type; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\OptionsResolver\OptionsResolver; /** * A type to add a closing motive @@ -13,34 +14,34 @@ use Symfony\Component\HttpFoundation\Request; */ class ClosingMotiveType extends AbstractType { - + private $locale; - + public function __construct(Request $request = NULL) { if ($request !== NULL) { $this->locale = $request->getLocale(); } } - + public function getName() { return 'closing_motive'; } - + public function getParent() { return 'entity'; } - - public function setDefaultOptions(\Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver) + + public function configureOptions(OptionsResolver $resolver) { if ($this->locale === NULL) { throw new \LogicException('the locale should be defined and is extracted ' . 'from the \'request\' service. Maybe was this service ' . 'unaccessible ?'); } - + $resolver->setDefaults(array( 'class' => 'ChillPersonBundle:AccompanyingPeriod\ClosingMotive', 'empty_data' => null, @@ -49,5 +50,5 @@ class ClosingMotiveType extends AbstractType ) ); } - + } diff --git a/Form/Type/GenderType.php b/Form/Type/GenderType.php index 1292fd2a3..3f996f0cb 100644 --- a/Form/Type/GenderType.php +++ b/Form/Type/GenderType.php @@ -3,7 +3,7 @@ namespace Chill\PersonBundle\Form\Type; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Chill\PersonBundle\Entity\Person; @@ -15,16 +15,11 @@ use Chill\PersonBundle\Entity\Person; */ class GenderType extends AbstractType { - - public function getName() { - return 'gender'; - } - public function getParent() { return ChoiceType::class; } - public function setDefaultOptions(OptionsResolverInterface $resolver) { + public function configureOptions(OptionsResolver $resolver) { $a = array( Person::MALE_GENDER => Person::MALE_GENDER, diff --git a/Form/Type/Select2MaritalStatusType.php b/Form/Type/Select2MaritalStatusType.php index 277286a24..65e2473d4 100644 --- a/Form/Type/Select2MaritalStatusType.php +++ b/Form/Type/Select2MaritalStatusType.php @@ -21,7 +21,7 @@ namespace Chill\PersonBundle\Form\Type; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; use Chill\MainBundle\Form\Type\DataTransformer\ObjectToIdTransformer; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\HttpFoundation\RequestStack; @@ -61,7 +61,7 @@ class Select2MaritalStatusType extends AbstractType $builder->addModelTransformer($transformer); } - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $locale = $this->requestStack->getCurrentRequest()->getLocale(); $maritalStatuses = $this->em->getRepository('Chill\PersonBundle\Entity\MaritalStatus')->findAll();