fix deprecations: systematic use of fqcn in getParent functions

This commit is contained in:
nobohan 2018-04-06 08:10:44 +02:00
parent 2474bb3e5a
commit 7e36eee27a
4 changed files with 37 additions and 33 deletions

View File

@ -22,6 +22,7 @@ namespace Chill\MainBundle\Form\Type;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Chill\MainBundle\Templating\TranslatableStringHelper; use Chill\MainBundle\Templating\TranslatableStringHelper;
use Chill\MainBundle\Entity\PostalCode; use Chill\MainBundle\Entity\PostalCode;
@ -38,18 +39,18 @@ class PostalCodeType extends AbstractType
* @var TranslatableStringHelper * @var TranslatableStringHelper
*/ */
protected $translatableStringHelper; protected $translatableStringHelper;
public function __construct(TranslatableStringHelper $helper) public function __construct(TranslatableStringHelper $helper)
{ {
$this->translatableStringHelper = $helper; $this->translatableStringHelper = $helper;
} }
public function getParent() public function getParent()
{ {
return \Symfony\Bridge\Doctrine\Form\Type\EntityType::class; return EntityType::class;
} }
public function configureOptions(OptionsResolver $resolver) public function configureOptions(OptionsResolver $resolver)
{ {
// create a local copy for usage in Closure // create a local copy for usage in Closure

View File

@ -22,16 +22,17 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
use Doctrine\ORM\EntityRepository; use Doctrine\ORM\EntityRepository;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\OptionsResolver\Options; use Symfony\Component\OptionsResolver\Options;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Chill\MainBundle\Entity\Scope; use Chill\MainBundle\Entity\Scope;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Chill\MainBundle\Templating\TranslatableStringHelper; use Chill\MainBundle\Templating\TranslatableStringHelper;
/** /**
* Allow to pick amongst available scope for the current * Allow to pick amongst available scope for the current
* user. * user.
* *
* options : * options :
* *
* - `center`: the center of the entity * - `center`: the center of the entity
* - `role` : the role of the user * - `role` : the role of the user
* *
@ -44,28 +45,28 @@ class ScopePickerType extends AbstractType
* @var AuthorizationHelper * @var AuthorizationHelper
*/ */
protected $authorizationHelper; protected $authorizationHelper;
/** /**
* *
* @var TokenStorageInterface * @var TokenStorageInterface
*/ */
protected $tokenStorage; protected $tokenStorage;
/** /**
* *
* @var EntityRepository * @var EntityRepository
*/ */
protected $scopeRepository; protected $scopeRepository;
/** /**
* *
* @var TranslatableStringHelper * @var TranslatableStringHelper
*/ */
protected $translatableStringHelper; protected $translatableStringHelper;
public function __construct( public function __construct(
AuthorizationHelper $authorizationHelper, AuthorizationHelper $authorizationHelper,
TokenStorageInterface $tokenStorage, TokenStorageInterface $tokenStorage,
EntityRepository $scopeRepository, EntityRepository $scopeRepository,
TranslatableStringHelper $translatableStringHelper TranslatableStringHelper $translatableStringHelper
) { ) {
@ -75,7 +76,7 @@ class ScopePickerType extends AbstractType
$this->translatableStringHelper = $translatableStringHelper; $this->translatableStringHelper = $translatableStringHelper;
} }
public function configureOptions(OptionsResolver $resolver) public function configureOptions(OptionsResolver $resolver)
{ {
$resolver $resolver
@ -86,7 +87,7 @@ class ScopePickerType extends AbstractType
->setRequired('role') ->setRequired('role')
->setAllowedTypes('role', ['string', \Symfony\Component\Security\Core\Role\Role::class ]) ->setAllowedTypes('role', ['string', \Symfony\Component\Security\Core\Role\Role::class ])
; ;
$resolver $resolver
->setDefault('class', Scope::class) ->setDefault('class', Scope::class)
->setDefault('placeholder', 'Choose the circle') ->setDefault('placeholder', 'Choose the circle')
@ -111,14 +112,14 @@ class ScopePickerType extends AbstractType
->andWhere(':user MEMBER OF gc.users') ->andWhere(':user MEMBER OF gc.users')
->setParameter('user', $this->tokenStorage->getToken()->getUser()) ->setParameter('user', $this->tokenStorage->getToken()->getUser())
; ;
return $qb; return $qb;
}) })
; ;
} }
public function getParent() public function getParent()
{ {
return \Symfony\Bridge\Doctrine\Form\Type\EntityType::class; return EntityType::class;
} }
} }

View File

@ -22,6 +22,7 @@ namespace Chill\MainBundle\Form\Type;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
/** /**
* Extends choice to allow adding select2 library on widget * Extends choice to allow adding select2 library on widget
@ -37,7 +38,7 @@ class Select2EntityType extends AbstractType
public function getParent() public function getParent()
{ {
return 'entity'; return EntityType::class;
} }
public function configureOptions(OptionsResolver $resolver) public function configureOptions(OptionsResolver $resolver)

View File

@ -23,14 +23,15 @@ use Doctrine\ORM\EntityRepository;
use Symfony\Component\OptionsResolver\Options; use Symfony\Component\OptionsResolver\Options;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Chill\MainBundle\Entity\User; use Chill\MainBundle\Entity\User;
/** /**
* Pick a user available for the given role and center. * Pick a user available for the given role and center.
* *
* Options : * Options :
* *
* - `role` : the role the user can reach * - `role` : the role the user can reach
* - `center`: the center a user can reach * - `center`: the center a user can reach
* *
@ -43,22 +44,22 @@ class UserPickerType extends AbstractType
* @var AuthorizationHelper * @var AuthorizationHelper
*/ */
protected $authorizationHelper; protected $authorizationHelper;
/** /**
* *
* @var TokenStorageInterface * @var TokenStorageInterface
*/ */
protected $tokenStorage; protected $tokenStorage;
/** /**
* *
* @var EntityRepository * @var EntityRepository
*/ */
protected $userRepository; protected $userRepository;
public function __construct( public function __construct(
AuthorizationHelper $authorizationHelper, AuthorizationHelper $authorizationHelper,
TokenStorageInterface $tokenStorage, TokenStorageInterface $tokenStorage,
EntityRepository $userRepository EntityRepository $userRepository
) { ) {
$this->authorizationHelper = $authorizationHelper; $this->authorizationHelper = $authorizationHelper;
@ -66,7 +67,7 @@ class UserPickerType extends AbstractType
$this->userRepository = $userRepository; $this->userRepository = $userRepository;
} }
public function configureOptions(OptionsResolver $resolver) public function configureOptions(OptionsResolver $resolver)
{ {
$resolver $resolver
@ -77,7 +78,7 @@ class UserPickerType extends AbstractType
->setRequired('role') ->setRequired('role')
->setAllowedTypes('role', ['string', \Symfony\Component\Security\Core\Role\Role::class ]) ->setAllowedTypes('role', ['string', \Symfony\Component\Security\Core\Role\Role::class ])
; ;
$resolver $resolver
->setDefault('class', User::class) ->setDefault('class', User::class)
->setDefault('empty_data', $this->tokenStorage->getToken()->getUser()) ->setDefault('empty_data', $this->tokenStorage->getToken()->getUser())
@ -101,14 +102,14 @@ class UserPickerType extends AbstractType
->andWhere('u.enabled = :enabled') ->andWhere('u.enabled = :enabled')
->setParameter('enabled', true) ->setParameter('enabled', true)
; ;
return $qb; return $qb;
}) })
; ;
} }
public function getParent() public function getParent()
{ {
return \Symfony\Bridge\Doctrine\Form\Type\EntityType::class; return EntityType::class;
} }
} }