Fixtures/fix loading people

.gitlab-ci.yml

@@ -5,11 +5,13 @@ image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
 cache:
   paths:
     - tests/app/vendor/
+    - .composer
 
 before_script:
   # add extensions to postgres
   - PGPASSWORD=$POSTGRES_PASSWORD psql -U $POSTGRES_USER -h db -c "CREATE EXTENSION IF NOT EXISTS unaccent; CREATE EXTENSION IF NOT EXISTS pg_trgm;"
   # Install and run Composer
+  - mkdir -p $COMPOSER_HOME
   - curl -sS https://getcomposer.org/installer | php
   - php -d memory_limit=2G composer.phar install
   - php tests/app/bin/console doctrine:migrations:migrate -n
@@ -34,6 +36,10 @@ variables:
   REDIS_HOST: redis
   REDIS_PORT: 6379
   REDIS_URL: redis://redis:6379
+  # change vendor dir to make the app install into tests/apps
+  COMPOSER_VENDOR_DIR: tests/app/vendor
+  # cache some composer data
+  COMPOSER_HOME: .composer
 
 
 # Run our tests

src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php

@@ -15,6 +15,7 @@ trait LoadAbstractNotificationsTrait
 {
     public function load(ObjectManager $manager)
     {
+        return;
         foreach ($this->notifs as $notif) {
             $entityId = $this->getReference($notif['entityRef'])->getId();
 

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriod.php

@@ -1,88 +0,0 @@
-<?php
-
-/*
- * Chill is a software for social workers
- *
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- * <http://www.champs-libres.coop>, <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace Chill\PersonBundle\DataFixtures\ORM;
-
-use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Persistence\ObjectManager;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
-
-/**
- * Description of LoadAccompanyingPeriod
- *
- * @author Champs-Libres Coop
- */
-class LoadAccompanyingPeriod extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
-{
-    use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
-
-
-    public const ACCOMPANYING_PERIOD = 'parcours 1';
-
-    public function getOrder()
-    {
-        return 10004;
-    }
-
-    public static $references = array();
-
-    public function load(ObjectManager $manager)
-    {
-
-        $centerA = $this->getReference('centerA');
-        $centerAId = $centerA->getId();
-
-        $personIds = $this->container->get('doctrine.orm.entity_manager')
-            ->createQueryBuilder()
-            ->select('p.id')
-            ->from('ChillPersonBundle:Person', 'p')
-            ->where('p.center = :centerAId')
-            ->orderBy('p.id', 'ASC')
-            ->setParameter('centerAId', $centerAId)
-            ->getQuery()
-            ->getScalarResult();
-
-        $openingDate = new \DateTime('2020-04-01');
-
-        $person1 = $manager->getRepository(Person::class)->find($personIds[0]);
-        $person2 = $manager->getRepository(Person::class)->find($personIds[1]);
-
-        $socialScope = $this->getReference('scope_social');
-
-        $a = new AccompanyingPeriod($openingDate);
-        $a->addPerson($person1);
-        $a->addPerson($person2);
-        $a->addScope($socialScope);
-        $a->setStep(AccompanyingPeriod::STEP_CONFIRMED);
-
-        $manager->persist($a);
-
-        $this->addReference(self::ACCOMPANYING_PERIOD, $a);
-        echo "Adding one AccompanyingPeriod\n";
-
-        $manager->flush();
-    }
-}

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php

@@ -6,7 +6,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\DataFixtures\ORM\LoadAbstractNotificationsTrait;
-use Chill\PersonBundle\DataFixtures\ORM\LoadAccompanyingPeriod;
 
 /**
  * Load notififications into database
@@ -19,7 +18,7 @@ class LoadAccompanyingPeriodNotifications extends AbstractFixture implements Dep
         [
             'message' => 'Hello !',
             'entityClass' => AccompanyingPeriod::class,
-            'entityRef' => LoadAccompanyingPeriod::ACCOMPANYING_PERIOD,
+            'entityRef' => null,
             'sender' => 'center a_social',
             'addressees' => [
                 'center a_social',
@@ -30,10 +29,15 @@ class LoadAccompanyingPeriodNotifications extends AbstractFixture implements Dep
         ]
     ];
 
+    protected function getEntityRef()
+    {
+        return null;
+    }
+
     public function getDependencies()
     {
         return [
-            LoadAccompanyingPeriod::class,
+            LoadPeople::class,
         ];
     }
 }

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php

@@ -157,6 +157,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
             ->setParameter('center', 'Center A')
             ->getScalarResult()
             ;
+
         \shuffle($this->personIds);
     }
 

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php

@@ -21,9 +21,15 @@
 
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\PostalCode;
+use Chill\MainBundle\Repository\CenterRepository;
+use Chill\MainBundle\Repository\CountryRepository;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\MaritalStatus;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Repository\MaritalStatusRepository;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
@@ -31,6 +37,7 @@ use Doctrine\Persistence\ObjectManager;
 use Chill\PersonBundle\Entity\Person;
 use Faker\Factory;
 use Faker\Generator;
+use Nelmio\Alice\Faker\GeneratorFactory;
 use Nelmio\Alice\Loader\NativeLoader;
 use Nelmio\Alice\ObjectSet;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
@@ -44,8 +51,6 @@ use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 /**
  * Load people into database
  *
- * @author Julien Fastré <julien arobase fastre point info>
- * @author Marc Ducobu <marc@champs-libres.coop>
  */
 class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
@@ -57,35 +62,50 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
 
     protected SocialIssueRepository $socialIssueRepository;
 
-    protected array $cacheSocialIssues = array();
+    protected CountryRepository $countryRepository;
 
-    public function __construct(Registry $workflowRegistry, SocialIssueRepository $socialIssueRepository)
+    protected NativeLoader $loader;
-    {
+
+    /**
+     * @var array|SocialIssue[]
+     */
+    protected array $cacheSocialIssues = [];
+
+    /**
+     * @var array|Country[]
+     */
+    protected array $cacheCountries = [];
+
+    /**
+     * @var array|Center[]
+     */
+    protected array $cacheCenters = [];
+
+    protected CenterRepository $centerRepository;
+
+    /**
+     * @var array|MaritalStatus[]
+     */
+    protected array $cacheMaritalStatuses = [];
+
+    protected MaritalStatusRepository $maritalStatusRepository;
+
+    public function __construct(
+        Registry $workflowRegistry,
+        SocialIssueRepository $socialIssueRepository,
+        CenterRepository $centerRepository,
+        CountryRepository $countryRepository,
+        MaritalStatusRepository $maritalStatusRepository
+    ) {
         $this->faker = Factory::create('fr_FR');
+        $this->faker->addProvider($this);
         $this->workflowRegistry = $workflowRegistry;
         $this->socialIssueRepository = $socialIssueRepository;
-    }
+        $this->centerRepository = $centerRepository;
+        $this->countryRepository = $countryRepository;
+        $this->maritalStatusRepository = $maritalStatusRepository;
+        $this->loader = new NativeLoader($this->faker);
 
-    public function prepare()
-    {
-        //prepare days, month, years
-        $y = 1950;
-        do {
-            $this->years[] = $y;
-            $y = $y +1;
-        } while ($y >= 1990);
-
-        $m = 1;
-        do {
-            $this->month[] = $m;
-            $m = $m +1;
-        } while ($m >= 12);
-
-        $d = 1;
-        do {
-            $this->day[] = $d;
-            $d = $d + 1;
-        } while ($d <= 28);
     }
 
     public function getOrder()
@@ -95,8 +115,8 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
 
     public function load(ObjectManager $manager)
     {
-        $this->loadRandPeople($manager);
         $this->loadExpectedPeople($manager);
+        $this->loadRandPeople($manager);
 
         $manager->flush();
     }
@@ -105,117 +125,102 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
     {
         echo "loading expected people...\n";
 
-        foreach ($this->peoples as $person) {
+
-            $this->addAPerson($this->fillWithDefault($person), $manager);
+        foreach ($this->peoples as $personDef) {
+            $person = $this->createExpectedPerson($personDef);
+            $this->addAPerson($person, $manager);
         }
     }
 
-    public function loadRandPeople(ObjectManager $manager)
+    protected function loadRandPeople(ObjectManager $manager)
     {
         echo "loading rand people...\n";
+        $persons = $this->createRandPerson()->getObjects();
 
-        $this->prepare();
+        foreach ($persons as $person) {
-
+            $this->addAPerson($person, $manager);
-        $chooseLastNameOrTri = array('tri', 'tri', 'name', 'tri');
-
-        $i = 0;
-
-        do {
-            $i++;
-
-            $sex = $this->genders[array_rand($this->genders)];
-
-            if ($chooseLastNameOrTri[array_rand($chooseLastNameOrTri)] === 'tri' ) {
-                $length = rand(2, 3);
-                $lastName = '';
-                for ($j = 0; $j <= $length; $j++) {
-                    $lastName .= $this->lastNamesTrigrams[array_rand($this->lastNamesTrigrams)];
         }
-                $lastName = ucfirst($lastName);
-            } else {
-                $lastName = $this->lastNames[array_rand($this->lastNames)];
     }
 
-            if ($sex === Person::MALE_GENDER) {
+    private function createRandPerson(): ObjectSet
-                $firstName = $this->firstNamesMale[array_rand($this->firstNamesMale)];
-            } else {
-                $firstName = $this->firstNamesFemale[array_rand($this->firstNamesFemale)];
-            }
-
-            // add an address on 80% of the created people
-            if (rand(0,100) < 80) {
-                $address = $this->getRandomAddress();
-                // on 30% of those person, add multiple addresses
-                if (rand(0,10) < 4) {
-                    $address = array(
-                       $address,
-                       $this->getRandomAddress()
-                    );
-                }
-            } else {
-                $address = null;
-            }
-
-            $person = array(
-                'FirstName' => $firstName,
-                'LastName' => $lastName,
-                'Gender' => $sex,
-                'Nationality' => (rand(0,100) > 50) ? NULL: 'BE',
-                'center' => (rand(0,1) == 0) ? 'centerA': 'centerB',
-                'Address' => $address,
-                'maritalStatus' => $this->maritalStatusRef[array_rand($this->maritalStatusRef)]
-            );
-
-            $this->addAPerson($this->fillWithDefault($person), $manager);
-
-        } while ($i <= 100);
-    }
-
-    /**
-     * fill a person array with default value
-     *
-     * @param string[] $specific
-     */
-    private function fillWithDefault(array $specific)
     {
-        return array_merge(array(
+        return $this->loader->loadData([
-                'Birthdate' => "1960-10-12",
+            Person::class => [
-                'PlaceOfBirth' => "Ottignies Louvain-La-Neuve",
+                'persons{1..300}' => [
-                'Gender' => Person::MALE_GENDER,
+                    'firstName' => '<firstname()>',
-                'Email' => "roger@yopmail.com",
+                    'lastName' => '<lastname()>',
-                'CountryOfBirth' => 'BE',
+                    'gender' => '<getRandomGender()>',
-                'Nationality' => 'BE',
+                    'nationality' => '<getRandomCountry()>',
-                'CFData' => array(),
+                    'center' => '<getRandomCenter()>',
-                'Address' => null
+                    'maritalStatus' => '<getRandomMaritalStatus()>',
-            ), $specific);
+                    'birthdate' => '<dateTimeBetween("-75 years", "-1 tears")>',
+                    'placeOfBirth' => '<city()>',
+                    'email' => '<freeEmail()>',
+                    'countryOfBirth' => '<getRandomCountry(80)>',
+                ]
+            ]
+        ]);
     }
 
-    private function getRandomSocialIssue(): SocialIssue
+    private function createExpectedPerson($default): Person
     {
-        if (0 === count($this->cacheSocialIssues)) {
+        $person = $this->loader->loadData([
-            $this->cacheSocialIssues = $this->socialIssueRepository->findAll();
+            Person::class => [
+                "person" => [
+                    'firstName' => $default['firstName'] ?? '<firstname()>',
+                    'lastName' => $default['lastName'] ?? '<lastname()>',
+                    'gender' => '<getRandomGender()>',
+                    'nationality' => '<getRandomCountry()>',
+                    'center' => '<getRandomCenter()>',
+                    'maritalStatus' => '<getRandomMaritalStatus()>',
+                    'birthdate' => '<dateTimeBetween("-75 years", "-1 tears")>',
+                    'placeOfBirth' => '<city()>',
+                    'email' => '<freeEmail()>',
+                    'countryOfBirth' => '<getRandomCountry(80)>',
+                ],
+            ]
+        ])->getObjects()['person'];
+
+        // force some values
+        foreach ($default as $key => $value) {
+            switch ($key) {
+                case 'birthdate':
+                    $person->setBirthdate(new \DateTime($value));
+                    break;
+                case 'center':
+                    $person->setCenter($this->centerRepository
+                        ->findOneBy(['name' => $value]));
+                    break;
+                case 'countryOfBirth':
+                case 'nationality':
+                    $country = $this->countryRepository
+                        ->findOneBy(['countryCode' => $value]);
+                    $person->{'set'.\ucfirst($key)}($country);
+                    break;
+                case 'maritalStatus':
+                    $person->setMaritalStatus($this->maritalStatusRepository
+                        ->find($value));
+                    break;
+            }
         }
 
-        return $this->cacheSocialIssues[\array_rand($this->cacheSocialIssues)];
+        return $person;
     }
 
     /**
      * create a new person from array data
      *
-     * @param array $person
-     * @param ObjectManager $manager
      * @throws \Exception
      */
-    private function addAPerson(array $person, ObjectManager $manager)
+    private function addAPerson(Person $person, ObjectManager $manager)
     {
-        $p = new Person();
         $accompanyingPeriod = new AccompanyingPeriod(
             (new \DateTime())
                 ->sub(
                     new \DateInterval('P' . \random_int(0, 180) . 'D')
                 )
         );
-        $p->addAccompanyingPeriod($accompanyingPeriod);
+        $person->addAccompanyingPeriod($accompanyingPeriod);
         $accompanyingPeriod->addSocialIssue($this->getRandomSocialIssue());
 
         if (\random_int(0, 10) > 3) {
@@ -225,53 +230,13 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
             $workflow->apply($accompanyingPeriod, 'confirm');
         }
 
-        foreach ($person as $key => $value) {
+        $manager->persist($person);
-            switch ($key) {
+        echo "add person'".$person->__toString()."'\n";
-                case 'CountryOfBirth':
-                case 'Nationality':
-                    $value = $this->getCountry($value);
-                    break;
-                case 'Birthdate':
-                    $value = new \DateTime($value);
-                    break;
-                case 'center':
-                case 'maritalStatus':
-                    $value = $this->getReference($value);
-                    break;
-                case 'accompanyingPeriods':
-                    $this->addAccompanyingPeriods($p, $value, $manager);
-                    break;
-            }
-
-            //try to add the data using the setSomething function,
-            // if not possible, fallback to addSomething function
-            if (method_exists($p, 'set'.$key)) {
-                call_user_func(array($p, 'set'.$key), $value);
-            } elseif (method_exists($p, 'add'.$key)) {
-                // if we have a "addSomething", we may have multiple items to add
-                // so, we set the value in an array if it is not an array, and
-                // will call the function addSomething multiple times
-                if (!is_array($value)) {
-                    $value = array($value);
-                }
-
-                foreach($value as $v) {
-                    if ($v !== NULL) {
-                        call_user_func(array($p, 'add'.$key), $v);
-                    }
-                }
-
-            }
-        }
-
-        $manager->persist($p);
-        echo "add person'".$p->__toString()."'\n";
     }
 
     private function createAddress(): Address
     {
-        $loader = new NativeLoader();
+        $objectSet = $this->loader->loadData([
-        $objectSet = $loader->loadData([
             Address::class => [
                 'address' => [
                     'street' => '<fr_FR:streetName()>',
@@ -285,6 +250,17 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
         return $objectSet->getObjects()['address'];
     }
 
+
+
+    private function getRandomSocialIssue(): SocialIssue
+    {
+        if (0 === count($this->cacheSocialIssues)) {
+            $this->cacheSocialIssues = $this->socialIssueRepository->findAll();
+        }
+
+        return $this->cacheSocialIssues[\array_rand($this->cacheSocialIssues)];
+    }
+
     private function getPostalCode(): PostalCode
     {
         $ref = LoadPostalCodes::$refs[\array_rand(LoadPostalCodes::$refs)];
@@ -306,7 +282,6 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
         return Point::fromLonLat($lon, $lat);
     }
 
-
     /**
      * Create a random address
      *
@@ -329,53 +304,77 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
         ;
     }
 
-    private function getCountry($countryCode)
+    /**
+     * @internal This method is public and called by faker as a custom generator
+     * @return Center
+     */
+    public function getRandomCenter(): Center
     {
-        if ($countryCode === NULL) {
+        if (0 === count($this->cacheCenters)) {
+            $this->cacheCenters = $this->centerRepository->findAll();
+        }
+
+        return $this->cacheCenters[\array_rand($this->cacheCenters)];
+    }
+
+    /**
+     * @internal This method is public and called by faker as a custom generator
+     * @param int $nullPercentage
+     * @return Country|null
+     * @throws \Exception
+     */
+    public function getRandomCountry(int $nullPercentage = 20): ?Country
+    {
+        if (0 === count($this->cacheCountries)) {
+            $this->cacheCountries = $this->countryRepository->findAll();
+        }
+
+        if ($nullPercentage < \random_int(0, 100)) {
             return NULL;
         }
-        return $this->container->get('doctrine.orm.entity_manager')
+
-              ->getRepository('ChillMainBundle:Country')
+        return $this->cacheCountries [\array_rand($this->cacheCountries)];
-              ->findOneByCountryCode($countryCode);
     }
 
-    private $maritalStatusRef = ['ms_single', 'ms_married', 'ms_widow', 'ms_separat',
+    /**
-        'ms_divorce', 'ms_legalco', 'ms_unknown'];
+     * @internal This method is public and called by faker as a custom generator
+     * @return string
+     */
+    public function getRandomGender(): string
+    {
+        return $this->genders[array_rand($this->genders)];
+    }
 
-    private $firstNamesMale = array("Jean", "Mohamed", "Alfred", "Robert", "Justin", "Brian",
+    /**
-        "Compère", "Jean-de-Dieu", "Charles", "Pierre", "Luc", "Mathieu", "Alain", "Etienne", "Eric",
+     * @internal This method is public and called by faker as a custom generator
-        "Corentin", "Gaston", "Spirou", "Fantasio", "Mahmadou", "Mohamidou", "Vursuv", "Youssef" );
+     * @param int $nullPercentage
+     * @return MaritalStatus|null
+     * @throws \Exception
+     */
+    public function getRandomMaritalStatus(int $nullPercentage = 50): ?MaritalStatus
+    {
+        if (0 === count($this->cacheMaritalStatuses)) {
+            $this->cacheMaritalStatuses = $this->maritalStatusRepository->findAll();
+        }
 
-    private $firstNamesFemale = array("Svedana", "Sevlatina", "Irène", "Marcelle",
+        if ($nullPercentage < \random_int(0, 100)) {
-        "Corentine", "Alfonsine", "Caroline", "Solange", "Gostine", "Fatoumata", "Nicole",
+            return NULL;
-        "Groseille", "Chana", "Oxana", "Ivana", "Julie", "Tina", "Adèle" );
+        }
 
-    private $lastNames = array("Diallo", "Bah", "Gaillot", "Martin");
+        return $this->cacheMaritalStatuses[array_rand($this->cacheMaritalStatuses)];
+    }
 
-    private $lastNamesTrigrams = array("fas", "tré", "hu", 'blart', 'van', 'der', 'lin', 'den',
+    private $genders = array(Person::MALE_GENDER, Person::FEMALE_GENDER, Person::BOTH_GENDER);
-        'ta', 'mi', 'net', 'gna', 'bol', 'sac', 'ré', 'jo', 'du', 'pont', 'cas', 'tor', 'rob', 'al',
-        'ma', 'gone', 'car',"fu", "ka", "lot", "no", "va", "du", "bu", "su", "jau", "tte", 'sir',
-        "lo", 'to', "cho", "car", 'mo','zu', 'qi', 'mu');
-
-    private $genders = array(Person::MALE_GENDER, Person::FEMALE_GENDER);
-
-    private $years = array();
-
-    private $month = array();
-
-    private $day = array();
 
     private $peoples = array(
         array(
-            'LastName' => "Depardieu",
+            'lastName' => "Depardieu",
-            'FirstName' => "Gérard",
+            'firstName' => "Gérard",
-            'Birthdate' => "1948-12-27",
+            'birthdate' => "1948-12-27",
-            'PlaceOfBirth' => "Châteauroux",
+            'placeOfBirth' => "Châteauroux",
-            'Gender' => Person::MALE_GENDER,
+            'nationality' => 'RU',
-            'CountryOfBirth' => 'FR',
+            'gender' => Person::MALE_GENDER,
-            'Nationality' => 'RU',
+            'center' => 'Center A',
-            'center' => 'centerA',
-            'maritalStatus' => 'ms_divorce',
             'accompanyingPeriods' => [
                 [
                     'from' => '2015-02-01',
@@ -394,67 +393,123 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
         ),
         array(
             //to have a person with same firstname as Gérard Depardieu
-            'LastName' => "Depardieu",
+            'lastName' => "Depardieu",
-            'FirstName' => "Jean",
+            'firstName' => "Jean",
-            'Birthdate' => "1960-10-12",
+            'birthdate' => "1960-10-12",
-            'CountryOfBirth' => 'FR',
+            'countryOfBirth' => 'FR',
-            'Nationality' => 'FR',
+            'nationality' => 'FR',
-            'center' => 'centerA',
+            'center' => 'Center A',
             'maritalStatus' => 'ms_divorce'
         ),
         array(
             //to have a person with same birthdate of Gérard Depardieu
-            'LastName' => 'Van Snick',
+            'lastName' => 'Van Snick',
-            'FirstName' => 'Bart',
+            'firstName' => 'Bart',
-            'Birthdate' => '1948-12-27',
+            'birthdate' => '1948-12-27',
-            'center' => 'centerA',
+            'center' => 'Center A',
             'maritalStatus' => 'ms_legalco'
         ),
         array(
             //to have a woman with Depardieu as FirstName
-            'LastName' => 'Depardieu',
+            'lastName' => 'Depardieu',
-            'FirstName' => 'Charline',
+            'firstName' => 'Charline',
-            'Gender' => Person::FEMALE_GENDER,
+            'gender' => Person::FEMALE_GENDER,
-            'center' => 'centerA',
+            'center' => 'Center A',
             'maritalStatus' => 'ms_legalco'
         ),
         array(
             //to have a special character in lastName
-            'LastName' => 'Manço',
+            'lastName' => 'Manço',
-            'FirstName' => 'Étienne',
+            'firstName' => 'Étienne',
-            'center' => 'centerA',
+            'center' => 'Center A',
             'maritalStatus' => 'ms_unknown'
         ),
         array(
             //to have true duplicate person
-            'LastName' => "Depardieu",
+            'lastName' => "Depardieu",
-            'FirstName' => "Jean",
+            'firstName' => "Jean",
-            'Birthdate' => "1960-10-12",
+            'birthdate' => "1960-10-12",
-            'CountryOfBirth' => 'FR',
+            'countryOfBirth' => 'FR',
-            'Nationality' => 'FR',
+            'nationality' => 'FR',
-            'center' => 'centerA',
+            'center' => 'Center A',
             'maritalStatus' => 'ms_divorce'
         ),
         array(
             //to have false duplicate person
-            'LastName' => "Depardieu",
+            'lastName' => "Depardieu",
-            'FirstName' => "Jeanne",
+            'firstName' => "Jeanne",
-            'Birthdate' => "1966-11-13",
+            'birthdate' => "1966-11-13",
-            'CountryOfBirth' => 'FR',
+            'countryOfBirth' => 'FR',
-            'Nationality' => 'FR',
+            'nationality' => 'FR',
-            'center' => 'centerA',
+            'center' => 'Center A',
             'maritalStatus' => 'ms_legalco'
         ),
+        [
+            'lastName' => 'Diallo',
+            'firstName' => "Fatoumata Binta"
+        ],
+        [
+            'lastName' => 'Diallo',
+            'firstName' => 'Abdoulaye',
+        ],
+        [
+            'lastName' => 'Diallo',
+            'firstName' => 'Diakite',
+        ],
+        [
+            'lastName' => 'Diallo',
+            'firstName' => 'Mohamed',
+        ],
+        [
+            'lastName' => 'Diallo',
+            'firstName' => 'Fatou',
+        ],
+        [
+            'lastName' => 'Diallo',
+            'firstName' => 'Fanta',
+        ],
+        [
+            'lastName' => 'Bah',
+            'firstName' => "Fatoumata Binta"
+        ],
+        [
+            'lastName' => 'Bah',
+            'firstName' => 'Abdoulaye',
+        ],
+        [
+            'lastName' => 'Bah',
+            'firstName' => 'Diakite',
+        ],
+        [
+            'lastName' => 'Bah',
+            'firstName' => 'Mohamed',
+        ],
+        [
+            'lastName' => 'Bah',
+            'firstName' => 'Fatou',
+        ],
+        [
+            'lastName' => 'Bah',
+            'firstName' => 'Fanta',
+        ],
+        [
+            'lastName' => 'Bah',
+            'firstName' => 'Gaston',
+        ],
+        [
+            'lastName' => 'Gaillot',
+            'firstName' => 'Adèle',
+        ],
     );
 
-
+/*
     private function addAccompanyingPeriods(Person $person, array $periods, ObjectManager $manager)
     {
         foreach ($periods as $period) {
 
             echo "adding new past Accompanying Period..\n";
 
-            /** @var AccompanyingPeriod $accompanyingPeriod */
+            /** @var AccompanyingPeriod $accompanyingPeriod
             $accompanyingPeriod = new AccompanyingPeriod(new \DateTime($period['from']));
             $accompanyingPeriod
                 ->setClosingDate(new \DateTime($period['to']))
@@ -464,4 +519,5 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
             $person->addAccompanyingPeriod($accompanyingPeriod);
         }
     }
+    */
 }

src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Chill\PersonBundle\Repository;
+
+use Chill\PersonBundle\Entity\MaritalStatus;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
+use UnexpectedValueException;
+
+class MaritalStatusRepository implements ObjectRepository
+{
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        $this->repository = $entityManager->getRepository(MaritalStatus::class);
+    }
+    public function find($id): ?MaritalStatus
+    {
+        return $this->repository->find($id);
+    }
+
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?MaritalStatus
+    {
+        return $this->findOneBy($criteria);
+    }
+
+    public function getClassName(): string
+    {
+        return MaritalStatus::class;
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php

@@ -168,7 +168,8 @@ class PersonControllerCreateTest extends WebTestCase
               "The page is accessible at the URL /{_locale}/person/new");
         $form = $crawler->selectButton("Ajouter la personne")->form();
 
-        $this->fillAValidCreationForm($form, 'roger', 'rabbit');
+        // create a very long name to avoid collision
+        $this->fillAValidCreationForm($form, 'Carmela Girdana Assuntamente Castalle', 'rabbit');
 
         $this->assertTrue($form->has(self::CENTER_INPUT),
               'The page contains a "center" input');

src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php

@@ -200,11 +200,10 @@ class PersonSearchTest extends WebTestCase
         $crawlerCanSee = $this->generateCrawlerForSearch('Gérard', 'center a_social');
         $crawlerCannotSee = $this->generateCrawlerForSearch('Gérard', 'center b_social');
 
-        $this->assertRegExp('/Gérard/', $crawlerCanSee->text(),
+        $this->assertRegExp('/Depardieu/', $crawlerCanSee->text(),
-                'center a_social may see "Gérard" in center a');
+                'center a_social may see "Depardieu" in center a');
-        $this->assertRegExp('/Aucune personne ne correspond aux termes de recherche/',
+        $this->assertNotRegExp('/Depardieu/', $crawlerCannotSee->text(),
-                $crawlerCannotSee->text(),
+            'center b_social may see "Depardieu" in center b');
-                'center b_social may not see any "Gérard" associated to center b');
 
     }
 

src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php

@@ -50,12 +50,9 @@ class TimelineAccompanyingPeriodTest extends WebTestCase
               "the timeline page loads sucessfully");
         $this->assertGreaterThan(0, $crawler->filter('.timeline div')->count(),
               "the timeline page contains multiple div inside a .timeline element");
-        $this->assertContains(" Une période d'accompagnement est ouverte",
+        $this->assertContains("est ouvert",
               $crawler->filter('.timeline')->text(),
-              "the text 'une période d'accompagnement a été ouverte' is present");
+              "the text 'est ouvert' is present");
-        $this->assertContains("Une periode d'accompagnement se clôture",
-              $crawler->Filter('.timeline')->text(),
-              "the text 'Une période d'accompagnement a été fermée' is present");
     }
 
     public function provideDataPersonWithAccompanyingPeriod()
@@ -71,8 +68,7 @@ class TimelineAccompanyingPeriodTest extends WebTestCase
             ->join('part.accompanyingPeriod', 'period')
             ->join('p.center', 'center')
             ->select('p.id')
-            ->where($qb->expr()->isNotNull('period.closingDate'))
+            ->where($qb->expr()->eq('center.name', ':center'))
-            ->andWhere($qb->expr()->eq('center.name', ':center'))
             ->setParameter('center', 'Center A')
             ->setMaxResults(1000)
             ->getQuery()

tests/app

@@ -1 +1 @@
-Subproject commit 614c9de4c7e606e1f89f02b6236f605767f110cb
+Subproject commit 8839b431f296733b792c788f2ef58e5ecd6419d3