From 9952a885ed9573c9e475fa621120d66c90e4c275 Mon Sep 17 00:00:00 2001
From: Tchama <mat@collectifs.net>
Date: Mon, 27 Jul 2020 17:24:01 +0200
Subject: [PATCH] fix sf4 error with PickPersonType (error in commit a92686d1)

---
 Form/Type/PickPersonType.php             | 9 +++++++--
 Resources/config/services/form.yml       | 1 +
 Resources/config/services/repository.yml | 5 +++--
 Resources/config/services/widgets.yml    | 1 +
 Widget/PersonListWidget.php              | 7 +++++++
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Form/Type/PickPersonType.php b/Form/Type/PickPersonType.php
index 90d223d61..839c84b69 100644
--- a/Form/Type/PickPersonType.php
+++ b/Form/Type/PickPersonType.php
@@ -31,7 +31,7 @@ use Chill\MainBundle\Entity\GroupCenter;
 use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Entity\Center;
-use Chill\PersonBundle\Entity\PersonRepository;
+use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Search\PersonSearch;
 use Symfony\Component\Translation\TranslatorInterface;
 use Chill\PersonBundle\Form\ChoiceLoader\PersonChoiceLoader;
@@ -55,7 +55,11 @@ use Symfony\Component\OptionsResolver\Options;
  */
 class PickPersonType extends AbstractType
 {
-   
+    /**
+     * @var PersonRepository
+     */
+    protected $personRepository;
+    
     /**
      *
      * @var \Chill\MainBundle\Entity\User
@@ -81,6 +85,7 @@ class PickPersonType extends AbstractType
     protected $translator;
 
     public function __construct(
+            PersonRepository $personRepository,
             TokenStorageInterface $tokenStorage,
             AuthorizationHelper $authorizationHelper,
             UrlGeneratorInterface $urlGenerator,
diff --git a/Resources/config/services/form.yml b/Resources/config/services/form.yml
index fe3d0d407..659421c8a 100644
--- a/Resources/config/services/form.yml
+++ b/Resources/config/services/form.yml
@@ -32,6 +32,7 @@ services:
     chill.person.form.type.pick_person:
         class: Chill\PersonBundle\Form\Type\PickPersonType
         arguments:
+            - "@chill.person.repository.person"
             - "@security.token_storage"
             - "@chill.main.security.authorization.helper"
             - '@Symfony\Component\Routing\Generator\UrlGeneratorInterface'
diff --git a/Resources/config/services/repository.yml b/Resources/config/services/repository.yml
index 91135871b..83fde0e4e 100644
--- a/Resources/config/services/repository.yml
+++ b/Resources/config/services/repository.yml
@@ -1,10 +1,11 @@
 services:
 
-    Chill\PersonBundle\Repository\PersonRepository:
-        class: Chill\PersonBundle\Person\PersonRepository
+    chill.person.repository.person:
+        class: Chill\PersonBundle\Repository\PersonRepository
         factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments:
             - 'Chill\PersonBundle\Entity\Person'
+    Chill\PersonBundle\Repository\PersonRepository: '@chill.person.repository.person'
             
     Chill\PersonBundle\Repository\ClosingMotiveRepository:
         class: Chill\PersonBundle\Repository\ClosingMotiveRepository
diff --git a/Resources/config/services/widgets.yml b/Resources/config/services/widgets.yml
index a43383b12..7ea920cc2 100644
--- a/Resources/config/services/widgets.yml
+++ b/Resources/config/services/widgets.yml
@@ -2,6 +2,7 @@ services:
     chill_person.widget.person_list:
         class: Chill\PersonBundle\Widget\PersonListWidget
         arguments:
+            - "@chill.person.repository.person"
             - "@doctrine.orm.entity_manager"
             - "@chill.main.security.authorization.helper"
             - "@security.token_storage"
diff --git a/Widget/PersonListWidget.php b/Widget/PersonListWidget.php
index 0f8de9704..6166bd08d 100644
--- a/Widget/PersonListWidget.php
+++ b/Widget/PersonListWidget.php
@@ -41,6 +41,12 @@ use Chill\CustomFieldsBundle\Entity\CustomField;
  */
 class PersonListWidget implements WidgetInterface
 {
+    /**
+     * Repository for persons
+     *
+     * @var EntityRepository
+     */
+    protected $personRepository;
     
     /**
      * The entity manager
@@ -69,6 +75,7 @@ class PersonListWidget implements WidgetInterface
     protected $user;
     
     public function __construct(
+            EntityRepository $personRepostory,
             EntityManager $em,
             AuthorizationHelper $authorizationHelper,
             TokenStorage $tokenStorage