From 906d1fdab51bdc17c1c15d6901ebe09b9a0eee06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 19 Apr 2023 13:01:48 +0200
Subject: [PATCH] DX: remove usage of deprecated Role class

---
 .../Controller/SingleTaskController.php             | 13 +++++--------
 src/Bundle/ChillTaskBundle/Form/SingleTaskType.php  |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
index 530f54b01..0cdcd7173 100644
--- a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
+++ b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
@@ -33,6 +33,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -205,7 +206,7 @@ final class SingleTaskController extends AbstractController
             . 'allowed to edit this 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);
 
         $form = $event->getForm();
@@ -557,7 +558,7 @@ final class SingleTaskController extends AbstractController
         $this->denyAccessUnlessGranted($role, $task, 'You are not '
              . 'allowed to create this task');
 
-        $form = $this->setCreateForm($task, new Role($role));
+        $form = $this->setCreateForm($task, $role);
 
         $form->handleRequest($request);
 
@@ -650,7 +651,7 @@ final class SingleTaskController extends AbstractController
     /**
      * @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, [
             'role' => $role,
@@ -684,12 +685,8 @@ final class SingleTaskController extends AbstractController
 
     /**
      * 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()
             ->setAction($this->generateUrl(
diff --git a/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php b/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
index 56e33954b..d27a2aa06 100644
--- a/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
+++ b/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
@@ -81,7 +81,7 @@ class SingleTaskType extends AbstractType
                 ->add('circle', ScopePickerType::class, [
                     'center' => $center,
                     'role' => $options['role'],
-                    'required' => false,
+                    'required' => true,
                 ]);
         }
     }