From 7e36eee27ae9f255fa45be06cbb7e8c2fe4f39e4 Mon Sep 17 00:00:00 2001 From: nobohan Date: Fri, 6 Apr 2018 08:10:44 +0200 Subject: [PATCH] fix deprecations: systematic use of fqcn in getParent functions --- Form/Type/PostalCodeType.php | 11 ++++++----- Form/Type/ScopePickerType.php | 31 ++++++++++++++++--------------- Form/Type/Select2EntityType.php | 3 ++- Form/Type/UserPickerType.php | 25 +++++++++++++------------ 4 files changed, 37 insertions(+), 33 deletions(-) diff --git a/Form/Type/PostalCodeType.php b/Form/Type/PostalCodeType.php index 8e8655df6..bdaae6bc9 100644 --- a/Form/Type/PostalCodeType.php +++ b/Form/Type/PostalCodeType.php @@ -22,6 +22,7 @@ namespace Chill\MainBundle\Form\Type; use Symfony\Component\Form\AbstractType; use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Chill\MainBundle\Templating\TranslatableStringHelper; use Chill\MainBundle\Entity\PostalCode; @@ -38,18 +39,18 @@ class PostalCodeType extends AbstractType * @var TranslatableStringHelper */ protected $translatableStringHelper; - + public function __construct(TranslatableStringHelper $helper) { $this->translatableStringHelper = $helper; } - - + + public function getParent() { - return \Symfony\Bridge\Doctrine\Form\Type\EntityType::class; + return EntityType::class; } - + public function configureOptions(OptionsResolver $resolver) { // create a local copy for usage in Closure diff --git a/Form/Type/ScopePickerType.php b/Form/Type/ScopePickerType.php index 838ecaae1..963cbb7b9 100644 --- a/Form/Type/ScopePickerType.php +++ b/Form/Type/ScopePickerType.php @@ -22,16 +22,17 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelper; use Doctrine\ORM\EntityRepository; use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\Options; +use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Chill\MainBundle\Entity\Scope; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Chill\MainBundle\Templating\TranslatableStringHelper; /** * Allow to pick amongst available scope for the current - * user. - * - * options : - * + * user. + * + * options : + * * - `center`: the center of the entity * - `role` : the role of the user * @@ -44,28 +45,28 @@ class ScopePickerType extends AbstractType * @var AuthorizationHelper */ protected $authorizationHelper; - + /** * * @var TokenStorageInterface */ protected $tokenStorage; - + /** * * @var EntityRepository */ protected $scopeRepository; - + /** * * @var TranslatableStringHelper */ protected $translatableStringHelper; - + public function __construct( - AuthorizationHelper $authorizationHelper, - TokenStorageInterface $tokenStorage, + AuthorizationHelper $authorizationHelper, + TokenStorageInterface $tokenStorage, EntityRepository $scopeRepository, TranslatableStringHelper $translatableStringHelper ) { @@ -75,7 +76,7 @@ class ScopePickerType extends AbstractType $this->translatableStringHelper = $translatableStringHelper; } - + public function configureOptions(OptionsResolver $resolver) { $resolver @@ -86,7 +87,7 @@ class ScopePickerType extends AbstractType ->setRequired('role') ->setAllowedTypes('role', ['string', \Symfony\Component\Security\Core\Role\Role::class ]) ; - + $resolver ->setDefault('class', Scope::class) ->setDefault('placeholder', 'Choose the circle') @@ -111,14 +112,14 @@ class ScopePickerType extends AbstractType ->andWhere(':user MEMBER OF gc.users') ->setParameter('user', $this->tokenStorage->getToken()->getUser()) ; - + return $qb; }) ; } - + public function getParent() { - return \Symfony\Bridge\Doctrine\Form\Type\EntityType::class; + return EntityType::class; } } diff --git a/Form/Type/Select2EntityType.php b/Form/Type/Select2EntityType.php index d052ad303..e72bf0d8e 100644 --- a/Form/Type/Select2EntityType.php +++ b/Form/Type/Select2EntityType.php @@ -22,6 +22,7 @@ namespace Chill\MainBundle\Form\Type; use Symfony\Component\Form\AbstractType; use Symfony\Component\OptionsResolver\OptionsResolver; +use Symfony\Bridge\Doctrine\Form\Type\EntityType; /** * Extends choice to allow adding select2 library on widget @@ -37,7 +38,7 @@ class Select2EntityType extends AbstractType public function getParent() { - return 'entity'; + return EntityType::class; } public function configureOptions(OptionsResolver $resolver) diff --git a/Form/Type/UserPickerType.php b/Form/Type/UserPickerType.php index 9fbc34dac..9cade1ad2 100644 --- a/Form/Type/UserPickerType.php +++ b/Form/Type/UserPickerType.php @@ -23,14 +23,15 @@ use Doctrine\ORM\EntityRepository; use Symfony\Component\OptionsResolver\Options; use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; +use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Chill\MainBundle\Entity\User; /** * Pick a user available for the given role and center. - * + * * Options : - * + * * - `role` : the role the user can reach * - `center`: the center a user can reach * @@ -43,22 +44,22 @@ class UserPickerType extends AbstractType * @var AuthorizationHelper */ protected $authorizationHelper; - + /** * * @var TokenStorageInterface */ protected $tokenStorage; - + /** * * @var EntityRepository */ protected $userRepository; - + public function __construct( - AuthorizationHelper $authorizationHelper, - TokenStorageInterface $tokenStorage, + AuthorizationHelper $authorizationHelper, + TokenStorageInterface $tokenStorage, EntityRepository $userRepository ) { $this->authorizationHelper = $authorizationHelper; @@ -66,7 +67,7 @@ class UserPickerType extends AbstractType $this->userRepository = $userRepository; } - + public function configureOptions(OptionsResolver $resolver) { $resolver @@ -77,7 +78,7 @@ class UserPickerType extends AbstractType ->setRequired('role') ->setAllowedTypes('role', ['string', \Symfony\Component\Security\Core\Role\Role::class ]) ; - + $resolver ->setDefault('class', User::class) ->setDefault('empty_data', $this->tokenStorage->getToken()->getUser()) @@ -101,14 +102,14 @@ class UserPickerType extends AbstractType ->andWhere('u.enabled = :enabled') ->setParameter('enabled', true) ; - + return $qb; }) ; } - + public function getParent() { - return \Symfony\Bridge\Doctrine\Form\Type\EntityType::class; + return EntityType::class; } }