From 58ddbfb67b5580c10f65d215235e06f4111dd1ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 7 Oct 2021 21:55:40 +0200
Subject: [PATCH] remove occurences for ThirdPartyCivility

---
 .../DataFixtures/ORM/LoadCivility.php              |  7 +------
 .../Repository/CivilityRepository.php              | 14 +++++++-------
 .../config/services/fixtures.yaml                  |  4 ----
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCivility.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCivility.php
index f398e9e1d..260e266d5 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCivility.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCivility.php
@@ -7,11 +7,6 @@ use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
 use Doctrine\Persistence\ObjectManager;
 
-/**
- * Class LoadThirdPartyCivility
- *
- * @author Mathieu Jaumotte mathieu.jaumotte@champs-libres.coop
- */
 class LoadCivility extends Fixture implements FixtureGroupInterface
 {
     public static function getGroups(): array
@@ -34,7 +29,7 @@ class LoadCivility extends Fixture implements FixtureGroupInterface
         ];
 
         foreach ( $civilities as $val) {
-            $civility = (new ThirdPartyCivility())
+            $civility = (new Civility())
                 ->setName($val['name'])
                 ->setActive(true);
             $manager->persist($civility);
diff --git a/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php b/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php
index 5c965a830..e6dea11ff 100644
--- a/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php
@@ -22,21 +22,21 @@
 
 namespace Chill\ThirdPartyBundle\Repository;
 
-use Chill\ThirdPartyBundle\Entity\ThirdPartyCivility;
+use Chill\MainBundle\Entity\Civility;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
- * @method ThirdPartyCivility|null find($id, $lockMode = null, $lockVersion = null)
- * @method ThirdPartyCivility|null findOneBy(array $criteria, array $orderBy = null)
- * @method ThirdPartyCivility[]    findAll()
- * @method ThirdPartyCivility[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ * @method Civility|null find($id, $lockMode = null, $lockVersion = null)
+ * @method Civility|null findOneBy(array $criteria, array $orderBy = null)
+ * @method Civility[]    findAll()
+ * @method Civility[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class ThirdPartyCivilityRepository extends ServiceEntityRepository
+class CivilityRepository extends ServiceEntityRepository
 {
     public function __construct(ManagerRegistry $registry)
     {
-        parent::__construct($registry, ThirdPartyCivility::class);
+        parent::__construct($registry, Civility::class);
     }
 
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/config/services/fixtures.yaml b/src/Bundle/ChillThirdPartyBundle/config/services/fixtures.yaml
index 33583f1aa..40f663e6d 100644
--- a/src/Bundle/ChillThirdPartyBundle/config/services/fixtures.yaml
+++ b/src/Bundle/ChillThirdPartyBundle/config/services/fixtures.yaml
@@ -4,10 +4,6 @@ services:
       tags:
           - { 'name': doctrine.fixture.orm }
 
-  Chill\ThirdPartyBundle\DataFixtures\ORM\LoadThirdPartyCivility:
-    tags:
-      - { 'name': doctrine.fixture.orm }
-
   Chill\ThirdPartyBundle\DataFixtures\ORM\LoadThirdPartyCategory:
     tags:
       - { 'name': doctrine.fixture.orm }