DX: remove usage of deprecated Role class

This commit is contained in:
Julien Fastré 2023-04-19 13:01:48 +02:00
parent a1421ea99f
commit 906d1fdab5
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
2 changed files with 6 additions and 9 deletions

View File

@ -33,6 +33,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\FormFactoryInterface; use Symfony\Component\Form\FormFactoryInterface;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
@ -205,7 +206,7 @@ final class SingleTaskController extends AbstractController
. 'allowed to edit this task'); . 'allowed to edit this task');
$event = (new UIEvent('single-task', $task)) $event = (new UIEvent('single-task', $task))
->setForm($this->setCreateForm($task, new Role(TaskVoter::UPDATE))); ->setForm($this->setCreateForm($task, TaskVoter::UPDATE));
$this->eventDispatcher->dispatch(UIEvent::EDIT_FORM, $event); $this->eventDispatcher->dispatch(UIEvent::EDIT_FORM, $event);
$form = $event->getForm(); $form = $event->getForm();
@ -557,7 +558,7 @@ final class SingleTaskController extends AbstractController
$this->denyAccessUnlessGranted($role, $task, 'You are not ' $this->denyAccessUnlessGranted($role, $task, 'You are not '
. 'allowed to create this task'); . 'allowed to create this task');
$form = $this->setCreateForm($task, new Role($role)); $form = $this->setCreateForm($task, $role);
$form->handleRequest($request); $form->handleRequest($request);
@ -650,7 +651,7 @@ final class SingleTaskController extends AbstractController
/** /**
* @return \Symfony\Component\Form\FormInterface * @return \Symfony\Component\Form\FormInterface
*/ */
protected function setCreateForm(SingleTask $task, Role $role) protected function setCreateForm(SingleTask $task, string $role)
{ {
$form = $this->createForm(SingleTaskType::class, $task, [ $form = $this->createForm(SingleTaskType::class, $task, [
'role' => $role, 'role' => $role,
@ -684,12 +685,8 @@ final class SingleTaskController extends AbstractController
/** /**
* Creates a form to delete a Task entity by id. * Creates a form to delete a Task entity by id.
*
* @param mixed $id The entity id
*
* @return \Symfony\Component\Form\Form The form
*/ */
private function createDeleteForm($id) private function createDeleteForm($id): FormInterface
{ {
return $this->createFormBuilder() return $this->createFormBuilder()
->setAction($this->generateUrl( ->setAction($this->generateUrl(

View File

@ -81,7 +81,7 @@ class SingleTaskType extends AbstractType
->add('circle', ScopePickerType::class, [ ->add('circle', ScopePickerType::class, [
'center' => $center, 'center' => $center,
'role' => $options['role'], 'role' => $options['role'],
'required' => false, 'required' => true,
]); ]);
} }
} }