From 36890a2256a9e9e6eb6aa4152eda24680ca20dbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 17 Dec 2021 00:33:02 +0100
Subject: [PATCH] person document: fix use of deprecated role class

---
 .../Controller/DocumentPersonController.php                | 7 +++----
 src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php | 2 +-
 .../Resources/views/PersonDocument/new.html.twig           | 6 +++++-
 src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php   | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
index 25ac9f1bd..5028757bd 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
@@ -24,7 +24,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
@@ -100,7 +99,7 @@ class DocumentPersonController extends AbstractController
             $document,
             [
                 'center' => $document->getCenter(),
-                'role' => new Role('CHILL_PERSON_DOCUMENT_UPDATE'),
+                'role' => 'CHILL_PERSON_DOCUMENT_UPDATE',
             ]
         );
         $form->handleRequest($request);
@@ -160,7 +159,7 @@ class DocumentPersonController extends AbstractController
         $reachableScopes = $this->authorizationHelper
             ->getReachableScopes(
                 $this->getUser(),
-                new Role(PersonDocumentVoter::SEE),
+                PersonDocumentVoter::SEE,
                 $person->getCenter()
             );
 
@@ -204,7 +203,7 @@ class DocumentPersonController extends AbstractController
 
         $form = $this->createForm(PersonDocumentType::class, $document, [
             'center' => $document->getCenter(),
-            'role' => new Role('CHILL_PERSON_DOCUMENT_CREATE'),
+            'role' => 'CHILL_PERSON_DOCUMENT_CREATE',
         ]);
         $form->handleRequest($request);
 
diff --git a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
index 474d9d132..86e8d350a 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
@@ -93,7 +93,7 @@ class PersonDocumentType extends AbstractType
         ]);
 
         $resolver->setRequired(['role', 'center'])
-            ->setAllowedTypes('role', [\Symfony\Component\Security\Core\Role\Role::class])
+            ->setAllowedTypes('role', ['string'])
             ->setAllowedTypes('center', [\Chill\MainBundle\Entity\Center::class]);
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
index 73d8cddf5..ad4fcfc81 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
@@ -32,7 +32,11 @@
 	{{ form_row(form.title) }}
 	{{ form_row(form.date) }}
 	{{ form_row(form.category) }}
-	{{ form_row(form.scope) }}
+
+    {% if form.scope is defined %}
+        {{ form_row(form.scope) }}
+    {% endif %}
+
 	{{ form_row(form.description) }}
 	{{ form_row(form.object, { 'label': 'Document', 'existing': document.object }) }}
 
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
index 4aa8948ec..0438669b4 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
@@ -80,7 +80,7 @@ class ScopePickerType extends AbstractType
     {
         $items = $this->authorizationHelper->getReachableScopes(
             $this->security->getUser(),
-            $options['role']->getRole(),
+            $options['role'] instanceof Role ? $options['role']->getRole() : $options['role'],
             $options['center']
         );