From 841bdb0ebfe6096fc210951b58c2f7b0518c5bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 11 Apr 2023 11:43:01 +0200
Subject: [PATCH] fix issues from master

---
 src/Bundle/ChillMainBundle/Search/SearchApi.php             | 6 +++---
 .../Security/Authorization/AuthorizationHelper.php          | 5 -----
 .../ChillPersonBundle/Controller/PersonController.php       | 4 ----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Search/SearchApi.php b/src/Bundle/ChillMainBundle/Search/SearchApi.php
index c8459dbdf..1fea71c46 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApi.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApi.php
@@ -11,8 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Search;
 
-use Chill\MainBundle\Pagination\Paginator;
 use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Pagination\PaginatorInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
@@ -100,7 +100,7 @@ class SearchApi
         return $items;
     }
 
-    private function buildUnionQuery(array $queries, Paginator $paginator): array
+    private function buildUnionQuery(array $queries, PaginatorInterface $paginator): array
     {
         $query = '{unions} ORDER BY pertinence DESC LIMIT ? OFFSET ?';
         $unions = [];
@@ -134,7 +134,7 @@ class SearchApi
         return (int) $countNq->getSingleScalarResult();
     }
 
-    private function fetchRawResult($queries, $types, Paginator $paginator): array
+    private function fetchRawResult($queries, $types, PaginatorInterface $paginator): array
     {
         [$union, $parameters] = $this->buildUnionQuery($queries, $paginator);
         $rsm = new ResultSetMappingBuilder($this->em);
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
index 9bb883317..768b35a75 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
@@ -63,7 +63,6 @@ class AuthorizationHelper implements AuthorizationHelperInterface
      *
      * @param User $user The user
      * @param array $centers a list of centers which are going to be filtered
-     * @param string $role
      */
     public function filterReachableCenters(User $user, array $centers, $role): array
     {
@@ -197,10 +196,6 @@ class AuthorizationHelper implements AuthorizationHelperInterface
      */
     public function getReachableScopes(UserInterface $user, string $role, Center|array $center): array
     {
-        if ($role instanceof Role) {
-            $role = $role->getRole();
-        }
-
         return $this->getReachableCircles($user, $role, $center);
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index 976f44703..ae12c566d 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -64,8 +64,6 @@ final class PersonController extends AbstractController
      */
     protected $personRepository;
 
-    private Security $security;
-
     /**
      * @var SimilarPersonMatcher
      */
@@ -101,7 +99,6 @@ final class PersonController extends AbstractController
         LoggerInterface $logger,
         ValidatorInterface $validator,
         EntityManagerInterface $em,
-        Security $security
     ) {
         $this->authorizationHelper = $authorizationHelper;
         $this->similarPersonMatcher = $similarPersonMatcher;
@@ -112,7 +109,6 @@ final class PersonController extends AbstractController
         $this->logger = $logger;
         $this->validator = $validator;
         $this->em = $em;
-        $this->security = $security;
     }
 
     public function editAction($person_id, Request $request)