Merge remote-tracking branch 'origin/master' into issue162_ACCent_display_addresses

CHANGELOG.md

@@ -10,14 +10,16 @@ and this project adheres to
 
 ## Unreleased
 
+<!-- write down unreleased development here -->
+* unnecessary whitespace removed from person banner after person-id + double parentheses removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/290)
+* [person]: delete accompanying period work, including related objects (cascade) (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/36)
 * [address]: Display of incomplete address adjusted.
 
-
-
 ## Test releases
 
 ### Test release 2021-11-08
 
+* [person]: Display the name of a user when searching after a User (TMS)
 * [person]: Add civility to the person
 * [person]: Various improvements on the edit person form
 * [person]: Set available_languages and available_countries as parameters for use in the edit person form
@@ -44,6 +46,7 @@ and this project adheres to
 * [household]: household addresses ordered by ValidFrom date and by id to show the last created address on top.
 * [socialWorkAction]: display of social issue and parent issues + banner context added. 
 * [DBAL dependencies] Upgrade to DBAL 3.1
+* [person]: double parentheses removed around age in banner + whitespace
 
 
 ### Test release 2021-10-27

composer.json

@@ -54,6 +54,9 @@
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "fakerphp/faker": "^1.13",
         "nelmio/alice": "^3.8",
+        "phpstan/extension-installer": "^1.1",
+        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan-strict-rules": "^1.0",
         "phpunit/phpunit": "^7.0",
         "symfony/debug-bundle": "^5.1",
         "symfony/dotenv": "^5.1",

phpstan.neon.dist

@@ -0,0 +1,21 @@
+parameters:
+    level: 1
+    paths:
+        - src/
+    excludePaths:
+        - src/Bundle/*/Tests/*
+        - src/Bundle/*/Test/*
+        - src/Bundle/*/config/*
+        - src/Bundle/*/migrations/*
+        - src/Bundle/*/translations/*
+        - src/Bundle/*/Resources/*
+        - src/Bundle/*/src/Tests/*
+        - src/Bundle/*/src/Test/*
+        - src/Bundle/*/src/config/*
+        - src/Bundle/*/src/migrations/*
+        - src/Bundle/*/src/translations/*
+        - src/Bundle/*/src/Resources/*
+
+includes:
+    - phpstan-baseline.neon
+

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php

@@ -105,12 +105,12 @@ class ActivityTypeAggregator implements AggregatorInterface
         return new Role(ActivityStatsVoter::STATS);
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): \Closure
     {
         // for performance reason, we load data from db only once
         $this->typeRepository->findBy(array('id' => $values));
 
-        return function($value) use ($data) {
+        return function($value): string {
             if ($value === '_header') {
                 return 'Activity type';
             }
@@ -120,12 +120,11 @@ class ActivityTypeAggregator implements AggregatorInterface
 
             return $this->stringHelper->localize($t->getName());
         };
-        
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
-        return array(self::KEY);
+        return [self::KEY];
     }
 
 }

src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig

@@ -40,7 +40,6 @@
         },
         {   'title': 'Users concerned'|trans,
             'items': entity.users,
-            'path' : 'admin_user_show',
             'key'  : 'id'
         },
     ] %}
@@ -58,6 +57,7 @@
                 <ul class="list-content">
                     {% for item in bloc.items %}
                     <li>
+                        {% if bloc.path is defined %}
                         <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
                             <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
                                 {{ item|chill_entity_render_box({
@@ -66,6 +66,14 @@
                                 }) }}
                             </span>
                         </a>
+                    {% else %}
+                        <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
+                            {{ item|chill_entity_render_box({
+                                'render': 'raw',
+                                'addAltNames': false
+                            }) }}
+                        </span>
+                    {% endif %}
                     </li>
                     {% endfor %}
                 </ul>
@@ -85,6 +93,7 @@
             <ul class="list-content">
                 {% for item in bloc.items %}
                 <li>
+                    {% if bloc.path is defined %}
                     <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
                         <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
                             {{ item|chill_entity_render_box({
@@ -93,6 +102,12 @@
                             }) }}
                         </span>
                     </a>
+                    {% else %}
+                        {{ item|chill_entity_render_box({
+                            'render': 'raw',
+                            'addAltNames': false
+                        }) }}
+                    {% endif %}
                 </li>
                 {% endfor %}
             </ul>
@@ -114,12 +129,19 @@
                     {% for item in bloc.items %}
 
                         <span class="wl-item {% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
+                            {% if bloc.path is defined %}
                             <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
                                 {{ item|chill_entity_render_box({
                                     'render': 'raw',
                                     'addAltNames': false
                                 }) }}
                             </a>
+                            {% else %}
+                                {{ item|chill_entity_render_box({
+                                    'render': 'raw',
+                                    'addAltNames': false
+                                }) }}
+                            {% endif %}
                         </span>
 
                     {% endfor %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deleteAccompanyingCourse.html.twig

@@ -10,7 +10,7 @@
             'title'             : 'Remove activity'|trans,
             'confirm_question'  : 'Are you sure you want to remove the activity about "%name%" ?'|trans({ '%name%' : accompanyingCourse.id } ),
             'cancel_route'      : 'chill_activity_activity_list',
-            'cancel_parameters' : { 'accompanying_course_id' : accompanyingCourse.id, 'id' : activity.id },
+            'cancel_parameters' : { 'accompanying_period_id' : accompanyingCourse.id, 'id' : activity.id },
             'form'              : delete_form
         } ) }}
 {% endblock %}

src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php

@@ -19,8 +19,6 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
 {
     /**
      * {@inheritdoc}
-     *
-     * @phpstan-ignore-next-line
      */
     public function load(array $configs, ContainerBuilder $container): void
     {

src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php

@@ -30,7 +30,9 @@ final class CategoryRender implements ChillEntityRenderInterface
     {
         $options = array_merge(self::DEFAULT_ARGS, $options);
 
-        $titles[] = $this->translatableStringHelper->localize($asideActivityCategory->getTitle());
+        $titles = [
+            $this->translatableStringHelper->localize($asideActivityCategory->getTitle()),
+        ];
 
         while ($asideActivityCategory->hasParent()) {
             $asideActivityCategory = $asideActivityCategory->getParent();

src/Bundle/ChillCalendarBundle/Controller/CalendarController.php

@@ -97,9 +97,9 @@ class CalendarController extends AbstractController
                 'calendarItems' => $calendarItems,
                 'user' => $user
             ]);
+        }
 
-        } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-
             $total = $this->calendarRepository->countByAccompanyingPeriod($accompanyingPeriod);
             $paginator = $this->paginator->create($total);
             $calendarItems = $this->calendarRepository->findBy(
@@ -117,6 +117,8 @@ class CalendarController extends AbstractController
                 'paginator' => $paginator
             ]);
         }
+
+        throw new \Exception('Unable to list actions.');
     }
 
     /**

src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php

@@ -46,7 +46,11 @@ class ChillCustomFieldsExtension extends Extension implements PrependExtensionIn
     public function prepend(ContainerBuilder $container)
     {
         // add form layout to twig resources
-        $twigConfig['form_themes'][] = 'ChillCustomFieldsBundle:Form:fields.html.twig';
+        $twigConfig = [
+            'form_themes' => [
+                'ChillCustomFieldsBundle:Form:fields.html.twig',
+            ],
+        ];
         $container->prependExtensionConfig('twig', $twigConfig);
 
         //add routes for custom bundle

src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php

@@ -145,5 +145,7 @@ class DocGeneratorTemplateController extends AbstractController
         } catch (TransferException $e) {
             throw $e;
         }
+
+        throw new \Exception('Unable to generate document.');
     }
 }

src/Bundle/ChillDocStoreBundle/EntityRepository/AccompanyingCourseDocumentRepository.php

@@ -1,8 +1,10 @@
 <?php
 
-namespace Chill\DocStoreBundle\Repository;
+declare(strict_types=1);
 
-use App\Entity\AccompanyingCourseDocument;
+namespace Chill\DocStoreBundle\EntityRepository;
+
+use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 

src/Bundle/ChillEventBundle/Controller/ParticipationController.php

@@ -181,7 +181,7 @@ class ParticipationController extends AbstractController
     protected function newMultiple(Request $request)
     {
         $participations = $this->handleRequest($request, new Participation(), true);
-        
+        $ignoredParticipations = $newParticipations = [];
 
         foreach ($participations as $i => $participation) {
             // check for authorization
@@ -209,7 +209,7 @@ class ParticipationController extends AbstractController
 
         // this is where the function redirect depending on valid participation
 
-        if (!isset($newParticipations)) {
+        if ([] === $newParticipations) {
             // if we do not have nay participants, redirect to event view
             $this->addFlash('error', $this->get('translator')->trans(
                     'None of the requested people may participate '
@@ -222,22 +222,27 @@ class ParticipationController extends AbstractController
             // if we have multiple participations, show a form with multiple participations
             $form = $this->createCreateFormMultiple($newParticipations);
 
-            return $this->render('ChillEventBundle:Participation:new-multiple.html.twig', array(
+            return $this->render(
+                'ChillEventBundle:Participation:new-multiple.html.twig',
+                [
                 'form' => $form->createView(),
                 'participations' => $newParticipations,
-                'ignored_participations' => isset($ignoredParticipations) ? $ignoredParticipations : array()
+                'ignored_participations' => $ignoredParticipations
-            ));
+                ]
-        } else {
+            );
+        }
+
         // if we have only one participation, show the same form than for single participation
         $form = $this->createCreateForm($participation);
 
-            return $this->render('ChillEventBundle:Participation:new.html.twig', array(
+        return $this->render(
+            'ChillEventBundle:Participation:new.html.twig',
+            [
                 'form' => $form->createView(),
                 'participation' => $participation,
-                'ignored_participations' => isset($ignoredParticipations) ? $ignoredParticipations : array()
+                'ignored_participations' => $ignoredParticipations,
-            ));
+            ]
-            
+        );
-        }
     }
 
     /**

src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php

@@ -504,6 +504,8 @@ class ApiController extends AbstractCRUDController
                     $this->getContextForSerializationPostAlter($action, $request, $_format, $entity, [$postedData])
                 );
         }
+
+        throw new \Exception('Unable to handle such request method.');
     }
     
     /**

src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php

@@ -72,6 +72,7 @@ class LoadCountriesCommand extends Command
     public static function prepareCountryList($languages)
     {
         $regionBundle = Intl::getRegionBundle();
+        $countries = [];
 
         foreach ($languages as $language) {
             $countries[$language] = $regionBundle->getCountryNames($language);

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

@@ -63,12 +63,13 @@ class LoadLanguages extends AbstractFixture implements ContainerAwareInterface,
     }
 
     /**
-     * prepare names for languages
+     * Prepare names for languages.
      *
-     * @param string $languageCode
      * @return string[] languages name indexed by available language code
      */
-    private function prepareName($languageCode) {
+    private function prepareName(string $languageCode): array {
+        $names = [];
+
         foreach ($this->container->getParameter('chill_main.available_languages') as $lang) {
             $names[$lang] = Intl::getLanguageBundle()->getLanguageName($languageCode);
         }

src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php

@@ -1,18 +1,15 @@
 <?php
-/*
+
- */
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection\CompilerPass;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Chill\MainBundle\Form\PermissionsGroupType;
 use Symfony\Component\DependencyInjection\Reference;
+use LogicException;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ACLFlagsCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
@@ -29,7 +26,7 @@ class ACLFlagsCompilerPass implements CompilerPassInterface
                         $permissionGroupType->addMethodCall('addFlagProvider', [ $reference ]);
                         break;
                     default:
-                        throw new \LogicalException(sprintf(
+                        throw new LogicException(sprintf(
                             "This tag 'scope' is not implemented: %s, on service with id %s", $tag['scope'], $id)
                             );
                 }

src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php

@@ -19,14 +19,11 @@ class Configuration implements ConfigurationInterface
 
     use AddWidgetConfigurationTrait;
 
-    /**
+    private ContainerBuilder $containerBuilder;
-     *
-     * @var ContainerBuilder
-     */
-    private $containerBuilder;
 
 
-    public function __construct(array $widgetFactories = array(),
+    public function __construct(
+            array $widgetFactories,
             ContainerBuilder $containerBuilder)
     {
         $this->setWidgetFactories($widgetFactories);

src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php

@@ -124,11 +124,12 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
      * @param string $containerWidgetConfigParameterName the key under which we can use the widget configuration
      * @throws \LogicException
      * @throws \UnexpectedValueException if the given extension does not implement HasWidgetExtensionInterface
-     * @throws \InvalidConfigurationException if there are errors in the config
      */
-    public function doProcess(ContainerBuilder $container, $extension,
+    public function doProcess(
-            $containerWidgetConfigParameterName)
+        ContainerBuilder $container,
-    {
+        $extension,
+        $containerWidgetConfigParameterName
+    ) {
         if (!$container->hasDefinition(self::WIDGET_MANAGER)) {
             throw new \LogicException("the service ".self::WIDGET_MANAGER." should".
                 " be present. It is required by ".self::class);
@@ -171,7 +172,7 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
 
                 // check that the widget is allowed at this place
                 if (!$this->isPlaceAllowedForWidget($place, $alias, $container)) {
-                    throw new \InvalidConfigurationException(sprintf(
+                    throw new InvalidConfigurationException(sprintf(
                         "The widget with alias %s is not allowed at place %s",
                         $alias,
                         $place

src/Bundle/ChillMainBundle/Doctrine/Model/Point.php

@@ -4,13 +4,9 @@ namespace Chill\MainBundle\Doctrine\Model;
 
 use \JsonSerializable;
 
-/**
- * Description of Point
- *
- */
 class Point implements JsonSerializable {
-    private ?float $lat = null;
+    private ?float $lat;
-    private ?float $lon = null;
+    private ?float $lon;
     public static string $SRID = '4326';
 
     private function __construct(?float $lon, ?float $lat)
@@ -22,6 +18,7 @@ class Point implements JsonSerializable {
     public function toGeoJson(): string
     {
         $array = $this->toArrayGeoJson();
+
         return \json_encode($array);
     }
 
@@ -33,60 +30,53 @@ class Point implements JsonSerializable {
     public function toArrayGeoJson(): array
     {
         return [
-            "type" => "Point",
+            'type' => 'Point',
-            "coordinates" => [ $this->lon, $this->lat ]
+            'coordinates' => [$this->lon, $this->lat],
         ];
     }
 
-    /**
-     *
-     * @return string
-     */
     public function toWKT(): string
     {
-        return 'SRID='.self::$SRID.';POINT('.$this->lon.' '.$this->lat.')';
+        return sprintf("SRID=%s;POINT(%s %s)", self::$SRID, $this->lon, $this->lat);
     }
 
-    /**
+    public static function fromGeoJson(string $geojson): self
-     *
-     * @param type $geojson
-     * @return Point
-     */
-    public static function fromGeoJson(string $geojson): Point
     {
         $a = json_decode($geojson);
-        //check if the geojson string is correct
+
-        if (NULL === $a or !isset($a->type) or !isset($a->coordinates)){
+        if (null === $a) {
             throw PointException::badJsonString($geojson);
         }
 
-        if ($a->type != 'Point'){
+        if (null === $a->type || null === $a->coordinates) {
+            throw PointException::badJsonString($geojson);
+        }
+
+        if ($a->type !== 'Point'){
             throw PointException::badGeoType();
         }
 
-        $lat = $a->coordinates[1];
+        [$lon, $lat] = $a->coordinates;
-        $lon = $a->coordinates[0];
 
         return Point::fromLonLat($lon, $lat);
     }
 
-    public static function fromLonLat(float $lon, float $lat): Point
+    public static function fromLonLat(float $lon, float $lat): self
-    {
-        if (($lon > -180 && $lon < 180) && ($lat > -90 && $lat < 90))
     {
+        if (($lon > -180 && $lon < 180) && ($lat > -90 && $lat < 90)) {
             return new Point($lon, $lat);
-        } else {
-            throw PointException::badCoordinates($lon, $lat);
-        }
         }
 
-    public static function fromArrayGeoJson(array $array): Point
+        throw PointException::badCoordinates($lon, $lat);
-    {
+    }
-        if ($array['type'] == 'Point' &&
+
-                isset($array['coordinates']))
+    public static function fromArrayGeoJson(array $array): self
     {
+        if ($array['type'] === 'Point' && isset($array['coordinates'])) {
             return self::fromLonLat($array['coordinates'][0], $array['coordinates'][1]);
         }
+
+        throw new \Exception('Unable to build a point from input data.');
     }
 
     public function getLat(): float

src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php

@@ -51,8 +51,10 @@ class CenterTransformer implements DataTransformerInterface
             }
         }
 
+        $ids = [];
+
         if ($this->multiple) {
-            $ids = \explode(',', $id);
+            $ids = explode(',', $id);
         } else {
             $ids[] = (int) $id;
         }
@@ -68,9 +70,9 @@ class CenterTransformer implements DataTransformerInterface
 
         if ($this->multiple) {
             return new ArrayCollection($centers);
-        } else {
-            return $centers[0];
         }
+
+        return $centers[0];
     }
 
     public function transform($center)

src/Bundle/ChillMainBundle/Repository/UserRepository.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Repository;
 
+use Chill\MainBundle\Entity\GroupCenter;
 use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;

src/Bundle/ChillMainBundle/Search/SearchApi.php

@@ -139,7 +139,7 @@ class SearchApi
         return $nq->getResult();
     }
 
-    private function prepareProviders($rawResults)
+    private function prepareProviders(array $rawResults)
     {
         $metadatas = [];
         foreach ($rawResults as $r) {
@@ -156,8 +156,10 @@ class SearchApi
         }
     }
 
-    private function buildResults($rawResults)
+    private function buildResults(array $rawResults): array
     {
+        $items = [];
+
         foreach ($rawResults as $r) {
             foreach ($this->providers as $k => $p) {
                 if ($p->supportsResult($r['key'], $r['metadata'])) {
@@ -170,6 +172,6 @@ class SearchApi
             }
         }
 
-        return $items ?? [];
+        return $items;
     }
 }

src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php

@@ -98,5 +98,7 @@ class PasswordRecoverVoter extends Voter
                 return true;
                 
         }
+
+        return false;
     }
 }

src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Address;
@@ -12,31 +14,41 @@ class AddressNormalizer implements NormalizerAwareInterface, NormalizerInterface
 {
     use NormalizerAwareTrait;
 
+    /**
+     * @param Address $address
+     */
     public function normalize($address, string $format = null, array $context = [])
     {
-        /** @var Address $address */
+        $data = [
-        $data['address_id'] = $address->getId();
+            'address_id' => $address->getId(),
-        $data['text'] = $address->isNoAddress() ? '' : $address->getStreetNumber().', '.$address->getStreet();
+            'text' => $address->isNoAddress() ? '' : $address->getStreetNumber().', '.$address->getStreet(),
-        $data['street'] = $address->getStreet();
+            'street' => $address->getStreet(),
-        $data['streetNumber'] = $address->getStreetNumber();
+            'streetNumber' => $address->getStreetNumber(),
-        $data['postcode']['id'] = $address->getPostCode()->getId();
+            'postcode' => [
-        $data['postcode']['name'] = $address->getPostCode()->getName();
+                'id' => $address->getPostCode()->getId(),
-        $data['postcode']['code'] = $address->getPostCode()->getCode();
+                'name' => $address->getPostCode()->getName(),
-        $data['country']['id'] = $address->getPostCode()->getCountry()->getId();
+                'code' => $address->getPostCode()->getCode(),
-        $data['country']['name'] = $address->getPostCode()->getCountry()->getName();
+            ],
-        $data['country']['code'] = $address->getPostCode()->getCountry()->getCountryCode();
+            'country' => [
-        $data['floor'] = $address->getFloor();
+                'id' => $address->getPostCode()->getCountry()->getId(),
-        $data['corridor'] = $address->getCorridor();
+                'name' => $address->getPostCode()->getCountry()->getName(),
-        $data['steps'] = $address->getSteps();
+                'code' => $address->getPostCode()->getCountry()->getCountryCode(),
-        $data['flat'] = $address->getFlat();
+            ],
-        $data['buildingName'] = $address->getBuildingName();
+            'floor' => $address->getFloor(),
-        $data['distribution'] = $address->getDistribution();
+            'corridor' => $address->getCorridor(),
-        $data['extra'] = $address->getExtra();
+            'steps' => $address->getSteps(),
-        $data['validFrom'] = $address->getValidFrom();
+            'flat' => $address->getFlat(),
-        $data['validTo'] = $address->getValidTo();
+            'buildingName' => $address->getBuildingName(),
-        $data['addressReference'] = $this->normalizer->normalize($address->getAddressReference(), $format, [
+            'distribution' => $address->getDistribution(),
-            AbstractNormalizer::GROUPS => ['read']
+            'extra' => $address->getExtra(),
-        ]);
+            'validFrom' => $address->getValidFrom(),
+            'validTo' => $address->getValidTo(),
+            'addressReference' => $this->normalizer->normalize(
+                $address->getAddressReference(),
+                $format,
+                [AbstractNormalizer::GROUPS => ['read']]
+            ),
+        ];
 
         return $data;
     }

src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php

@@ -11,30 +11,28 @@ class CollectionNormalizer implements NormalizerInterface, NormalizerAwareInterf
 {
     use NormalizerAwareTrait;
 
+    /**
+     * @param Collection $collection
+     */
+    public function normalize($collection, string $format = null, array $context = [])
+    {
+        $paginator = $collection->getPaginator();
+
+        return [
+            'count' => $paginator->getTotalItems(),
+            'pagination' => [
+                'first' => $paginator->getCurrentPageFirstItemNumber(),
+                'items_per_page' => $paginator->getItemsPerPage(),
+                'next' => $paginator->hasNextPage() ? $paginator->getNextPage()->generateUrl() : null,
+                'previous' => $paginator->hasPreviousPage() ? $paginator->getPreviousPage()->generateUrl() : null,
+                'more' => $paginator->hasNextPage(),
+            ],
+            'results' => $this->normalizer->normalize($collection->getItems(), $format, $context),
+        ];
+    }
+
     public function supportsNormalization($data, string $format = null): bool
     {
         return $data instanceof Collection;
     }
-
-    public function normalize($collection, string $format = null, array $context = [])
-    {
-        /** @var $collection Collection */
-        $paginator = $collection->getPaginator();
-
-        $data['count'] = $paginator->getTotalItems();
-        $pagination['first'] = $paginator->getCurrentPageFirstItemNumber();
-        $pagination['items_per_page'] = $paginator->getItemsPerPage();
-        $pagination['next']  = $paginator->hasNextPage() ? 
-            $paginator->getNextPage()->generateUrl() : null;
-        $pagination['previous'] = $paginator->hasPreviousPage() ?
-            $paginator->getPreviousPage()->generateUrl() : null;
-        $pagination['more'] = $paginator->hasNextPage();
-        $data['pagination'] = $pagination;
-
-        // normalize results
-        $data['results'] = $this->normalizer->normalize($collection->getItems(),
-            $format, $context);
-
-        return $data;
-    }
 }

src/Bundle/ChillMainBundle/Tests/Util/DateRangeCoveringTest.php

@@ -37,6 +37,18 @@ class DateRangeCoveringTest extends TestCase
         $this->assertNotContains(3, $cover->getIntersections()[0][2]);
     }
 
+    public function testCoveringWithMinCover1_NoCoveringWithNullDates()
+    {
+        $cover = new DateRangeCovering(1, new \DateTimeZone('Europe/Brussels')); 
+        $cover
+            ->add(new \DateTime('2021-10-05'), new \DateTime('2021-10-18'), 521)
+            ->add(new \DateTime('2021-10-26'), null, 663)
+            ->compute()
+            ;
+
+        $this->assertFalse($cover->hasIntersections());
+    }
+
     public function testCoveringWithMinCover1WithTwoIntersections()
     {
         $cover = new DateRangeCovering(1, new \DateTimeZone('Europe/Brussels')); 

src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php

@@ -291,11 +291,12 @@ class TimelineBuilder implements ContainerAwareInterface
                     $entitiesByType[$result['type']][$result['id']], //the entity
                     $context,
                     $args);
-            $timelineEntry['date'] = new \DateTime($result['date']);
-            $timelineEntry['template'] = $data['template'];
-            $timelineEntry['template_data'] = $data['template_data'];
 
-            $timelineEntries[] = $timelineEntry;
+            $timelineEntries[] = [
+                'date' => new \DateTime($result['date']),
+                'template' => $data['template'],
+                'template_data' => $data['template_data']
+            ];
         }
 
         return $this->container->get('templating')

src/Bundle/ChillMainBundle/Util/DateRangeCovering.php

@@ -140,72 +140,11 @@ class DateRangeCovering
         return $this;
     }
 
-    private function process(array $intersections): array
-    {
-        $result = [];
-        $starts = [];
-        $ends   = [];
-        $metadatas = [];
-
-        while (null !== ($current = \array_pop($intersections))) {
-            list($cStart, $cEnd, $cMetadata) = $current;
-            $n = count($cMetadata);
-
-            foreach ($intersections as list($iStart, $iEnd, $iMetadata)) {
-                $start = max($cStart, $iStart);
-                $end = min($cEnd, $iEnd);
-
-                if ($start <= $end) {
-                    if (FALSE !== ($key = \array_search($start, $starts))) {
-                        if ($ends[$key] === $end) {
-                            $metadatas[$key] = \array_unique(\array_merge($metadatas[$key], $iMetadata));
-                            continue;
-                        }
-                    }
-                    $starts[] = $start;
-                    $ends[]   = $end;
-                    $metadatas[] = \array_unique(\array_merge($iMetadata, $cMetadata));
-                }
-            }
-        }
-
-        // recompose results
-        foreach ($starts as $k => $start) {
-            $result[] = [$start, $ends[$k], \array_unique($metadatas[$k])];
-        }
-
-        return $result;
-    }
-
-    private function addToIntersections(array $intersections, array $intersection)
-    {
-        $foundExisting = false;
-        list($nStart, $nEnd, $nMetadata) = $intersection;
-
-        \array_walk($intersections, 
-            function(&$i, $key) use ($nStart, $nEnd, $nMetadata, $foundExisting) {
-                if ($foundExisting) {
-                    return;
-                };
-                if ($i[0] === $nStart && $i[1] === $nEnd) {
-                    $foundExisting = true;
-                    $i[2] = \array_merge($i[2], $nMetadata);
-                }
-            }
-        );
-
-        if (!$foundExisting) {
-            $intersections[] = $intersection;
-        }
-
-        return $intersections;
-    }
-
     public function hasIntersections(): bool
     {
         if (!$this->computed) {
             throw new \LogicException(sprintf("You cannot call the method %s before ".
-                "'process'", __METHOD));
+                "'process'", __METHOD__));
         }
 
         return count($this->intersections) > 0;
@@ -215,7 +154,7 @@ class DateRangeCovering
     {
         if (!$this->computed) {
             throw new \LogicException(sprintf("You cannot call the method %s before ".
-                "'process'", __METHOD));
+                "'process'", __METHOD__));
         }
 
         return $this->intersections;

src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php

@@ -1,20 +1,7 @@
 <?php
-/*
+
- * Copyright (C) 2016-2019 Champs-Libres <info@champs-libres.coop>
+declare(strict_types=1);
- *
+
- * 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\CRUD\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -23,11 +10,8 @@ use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use BadMethodCallException;
 
-/**
- * Controller for entities attached as one-to-on to a person
- * 
- */
 class OneToOneEntityPersonCRUDController extends CRUDController
 {
     protected function getTemplateFor($action, $entity, Request $request)
@@ -83,7 +67,7 @@ class OneToOneEntityPersonCRUDController extends CRUDController
 
     protected function generateRedirectOnCreateRoute($action, Request $request, $entity)
     {
-        throw new BadMethodCallException("not implemtented yet");
+        throw new BadMethodCallException('Not implemented yet.');
     }
 
 }

src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php

@@ -959,6 +959,8 @@ EOF
                 $table->setHeaders(array('#', 'label', 'value'));
                 $i = 0;
 
+                $matchingTableRowAnswer = [];
+
                 foreach($answers as $key => $answer) {
                     $table->addRow(array(
                         $i, $answer, $key

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php

@@ -54,10 +54,14 @@ class AccompanyingCourseApiController extends ApiController
         $accompanyingPeriod = $this->getEntity('participation', $id, $request);
 
         $this->checkACL('confirm', $request, $_format, $accompanyingPeriod);
-$workflow = $this->registry->get($accompanyingPeriod);
+        $workflow = $this->registry->get($accompanyingPeriod);
 
         if (FALSE === $workflow->can($accompanyingPeriod, 'confirm')) {
-            throw new BadRequestException('It is not possible to confirm this period');
+            // throw new BadRequestException('It is not possible to confirm this period');
+            $errors = $this->validator->validate($accompanyingPeriod, null, [$accompanyingPeriod::STEP_CONFIRMED]);
+            if( count($errors) > 0 ){
+                return $this->json($errors, 422);
+            }
         }
 
         $workflow->apply($accompanyingPeriod, 'confirm');
@@ -109,6 +113,13 @@ $workflow = $this->registry->get($accompanyingPeriod);
 
     public function resourceApi($id, Request $request, string $_format): Response
     {
+        $accompanyingPeriod = $this->getEntity('resource', $id, $request);
+        $errors = $this->validator->validate($accompanyingPeriod);
+
+        if ($errors->count() > 0) {
+            return $this->json($errors, 422);
+        }
+
         return $this->addRemoveSomething('resource', $id, $request, $_format, 'resource', Resource::class);
     }
 

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php

@@ -11,7 +11,10 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\Form\Form;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 
 class AccompanyingCourseWorkController extends AbstractController
 {
@@ -19,17 +22,20 @@ class AccompanyingCourseWorkController extends AbstractController
     private SerializerInterface $serializer;
     private AccompanyingPeriodWorkRepository $workRepository;
     private PaginatorFactory $paginator;
+    protected LoggerInterface $logger;
 
     public function __construct(
         TranslatorInterface $trans,
         SerializerInterface $serializer,
         AccompanyingPeriodWorkRepository $workRepository,
-        PaginatorFactory $paginator
+        PaginatorFactory $paginator,
+        LoggerInterface $chillLogger
     ) {
         $this->trans = $trans;
         $this->serializer = $serializer;
         $this->workRepository = $workRepository;
         $this->paginator = $paginator;
+        $this->logger = $logger;
     }
 
     /**
@@ -106,4 +112,65 @@ class AccompanyingCourseWorkController extends AbstractController
             'paginator' => $paginator
         ]);
     }
+
+
+    /**
+     * @Route(
+     *  "{_locale}/person/accompanying-period/work/{id}/delete",
+     *  name="chill_person_accompanying_period_work_delete",
+     *  methods={"GET", "POST", "DELETE"}
+     *  )
+     */
+    public function deleteWork(AccompanyingPeriodWork $work, Request $request): Response
+    {
+        // TODO ACL
+        $em = $this->getDoctrine()->getManager();
+
+        $form = $this->createDeleteForm($work->getId());
+
+        if ($request->getMethod() === Request::METHOD_DELETE) {
+            $form->handleRequest($request);
+
+            if ($form->isValid()) {
+
+                $this->logger->notice("An accompanying period work has been removed", [
+                   'by_user' => $this->getUser()->getUsername(),
+                   'work_id' => $work->getId(),
+                   'accompanying_period_id' => $work->getAccompanyingPeriod()->getId()
+                ]);
+
+                $em->remove($work);
+                $em->flush();
+
+                $this->addFlash(
+                    'success',
+                    $this->trans->trans("The accompanying period work has been successfully removed.")
+                );
+
+                return $this->redirectToRoute('chill_person_accompanying_period_work_list', [
+                    'id' => $work->getAccompanyingPeriod()->getId()
+                ]);
+            }
+        }
+
+        return $this->render('@ChillPerson/AccompanyingCourseWork/delete.html.twig', [
+            'accompanyingCourse' => $work->getAccompanyingPeriod(),
+            'work' => $work,
+            'delete_form' => $form->createView()
+        ]);
+    }
+
+    private function createDeleteForm(int $id): Form
+    {
+        $params['id'] = $id;
+
+        return $this->createFormBuilder()
+            ->setAction($this->generateUrl('chill_person_accompanying_period_work_delete', $params))
+            ->setMethod('DELETE')
+            ->add('submit', SubmitType::class, ['label' => 'Delete'])
+            ->getForm()
+        ;
+    }
+
+
 }

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

@@ -40,7 +40,7 @@ class LoadAccompanyingPeriodOrigin extends AbstractFixture implements OrderedFix
 
     public function getOrder()
     {
-        return 10005;
+        return 9000;
     }
 
     private $phoneCall = ['en' => 'phone call', 'fr' => 'appel téléphonique'];

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

@@ -161,8 +161,10 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
         \shuffle($this->personIds);
     }
 
-    private function getRandomPersons(int $min, int $max)
+    private function getRandomPersons(int $min, int $max): array
     {
+        $persons = [];
+
         $nb = \random_int($min, $max);
 
         for ($i=0; $i < $nb; $i++) {
@@ -172,7 +174,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
                 ;
         }
 
-        return $persons ?? [];
+        return $persons;
     }
 
     public function getDependencies()

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

@@ -247,7 +247,9 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
         if (\random_int(0, 10) > 3) {
             // always add social scope:
             $accompanyingPeriod->addScope($this->getReference('scope_social'));
-
+            $origin = $this->getReference(LoadAccompanyingPeriodOrigin::ACCOMPANYING_PERIOD_ORIGIN);
+            $accompanyingPeriod->setOrigin($origin);
+            $accompanyingPeriod->setIntensity('regular');
             $accompanyingPeriod->setAddressLocation($this->createAddress());
             $manager->persist($accompanyingPeriod->getAddressLocation());
             $workflow = $this->workflowRegistry->get($accompanyingPeriod);

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -45,6 +45,9 @@ use Chill\MainBundle\Entity\User;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\GroupSequenceProviderInterface;
+use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOverlap;
+use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ResourceDuplicateCheck;
 
 /**
  * AccompanyingPeriod Class
@@ -54,9 +57,10 @@ use Symfony\Component\Validator\Constraints as Assert;
  * @DiscriminatorMap(typeProperty="type", mapping={
  *  "accompanying_period"=AccompanyingPeriod::class
  *  })
+ * @Assert\GroupSequenceProvider
  */
 class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface,
-    HasScopesInterface, HasCentersInterface
+    HasScopesInterface, HasCentersInterface, GroupSequenceProviderInterface
 {
     /**
      * Mark an accompanying period as "occasional"
@@ -132,6 +136,7 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      *       cascade={"persist", "remove"},
      *       orphanRemoval=true
      *     )
+     * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_DRAFT})
      */
     private $comments;
 
@@ -147,9 +152,10 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      * @var Collection
      *
      * @ORM\OneToMany(targetEntity=AccompanyingPeriodParticipation::class,
-     *     mappedBy="accompanyingPeriod",
+     *     mappedBy="accompanyingPeriod", orphanRemoval=true,
      *     cascade={"persist", "refresh", "remove", "merge", "detach"})
      * @Groups({"read"})
+     * @ParticipationOverlap(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED})
      */
     private $participations;
 
@@ -188,6 +194,7 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      * @ORM\ManyToOne(targetEntity=Origin::class)
      * @ORM\JoinColumn(nullable=true)
      * @Groups({"read", "write"})
+     * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
     private $origin;
 
@@ -195,8 +202,9 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      * @var string
      * @ORM\Column(type="string", nullable=true)
      * @Groups({"read", "write"})
+     * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
-    private $intensity;
+    private $intensity = self::INTENSITY_OCCASIONAL;
 
     /**
      * @var Collection
@@ -210,6 +218,7 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      *     inverseJoinColumns={@ORM\JoinColumn(name="scope_id", referencedColumnName="id")}
      * )
      * @Groups({"read"})
+     * @Assert\Count(min=1, groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
     private $scopes;
 
@@ -256,6 +265,7 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      *     orphanRemoval=true
      * )
      * @Groups({"read"})
+     * @ResourceDuplicateCheck(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED, "Default", "default"})
      */
     private $resources;
 
@@ -267,6 +277,7 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      *     name="chill_person_accompanying_period_social_issues"
      *  )
      * @Groups({"read"})
+     * @Assert\Count(min=1, groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
     private Collection $socialIssues;
 
@@ -606,6 +617,14 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
         return $participation;
     }
 
+    /**
+     * Remove Participation
+     */
+
+    public function removeParticipation(AccompanyingPeriodParticipation $participation)
+    {
+        $participation->setAccompanyingPeriod(null);
+    }
 
     /**
      * Remove Person
@@ -1115,4 +1134,17 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
 
         return $centers ?? null;
     }
+
+    public function getGroupSequence()
+    {
+        if($this->getStep() == self::STEP_DRAFT)
+        {
+            return [[self::STEP_DRAFT]];
+        }
+
+        if($this->getStep() == self::STEP_CONFIRMED)
+        {
+            return [[self::STEP_DRAFT, self::STEP_CONFIRMED]];
+        }
+    }
 }

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php

@@ -167,7 +167,7 @@ use Symfony\Component\Validator\Constraints as Assert;
       * @ORM\OneToMany(
       *     targetEntity=AccompanyingPeriodWorkEvaluation::class,
       *     mappedBy="accompanyingPeriodWork",
-      *     cascade={"persist"},
+      *     cascade={"remove", "persist"},
       *     orphanRemoval=true
       * )
       * @Serializer\Groups({"read"})

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php

@@ -70,7 +70,8 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
 
     /**
     * @ORM\ManyToOne(
-    *     targetEntity=StoredObject::class
+    *     targetEntity=StoredObject::class,
+    *     cascade={"remove"},
     * )
      * @Serializer\Groups({"read"})
     */

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php

@@ -33,7 +33,13 @@ use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity
- * @ORM\Table(name="chill_person_accompanying_period_resource")
+ * @ORM\Table(
+ *  name="chill_person_accompanying_period_resource",
+ *  uniqueConstraints={
+ *      @ORM\UniqueConstraint(name="person_unique", columns={"person_id", "accompanyingperiod_id"}),
+ *      @ORM\UniqueConstraint(name="thirdparty_unique", columns={"thirdparty_id", "accompanyingperiod_id"})
+ *  }
+ * )
  * @DiscriminatorMap(typeProperty="type", mapping={
  *   "accompanying_period_resource"=Resource::class
  *  })

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php

@@ -134,4 +134,11 @@ class AccompanyingPeriodParticipation
     {
         return $this->endDate === null;
     }
+
+    private function checkSameStartEnd() 
+    {
+        if($this->endDate == $this->startDate) {
+            $this->accompanyingPeriod->removeParticipation($this);
+        }
+    }
 }

src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php

@@ -143,6 +143,8 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
 
     public function getLabels($key, array $values, $data)
     {
+        $labels = [];
+
         if ($data['group_by_level'] === 'country') {
             $qb = $this->countriesRepository->createQueryBuilder('c');
 
@@ -153,15 +155,17 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
                     ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
 
             // initialize array and add blank key for null values
-            $labels[''] = $this->translator->trans('without data');
+            $labels = [
-            $labels['_header'] = $this->translator->trans('Country of birth');
+                '' => $this->translator->trans('without data'),
+                '_header' => $this->translator->trans('Country of birth'),
+            ];
+
             foreach($countries as $row) {
                 $labels[$row['c_countryCode']] = $this->translatableStringHelper->localize($row['c_name']);
             }
+        }
 
-
+        if ($data['group_by_level'] === 'continent') {
-        } elseif ($data['group_by_level'] === 'continent') {
-
             $labels = array(
                 'EU' => $this->translator->trans('Europe'),
                 'AS' => $this->translator->trans('Asia'),
@@ -175,8 +179,7 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
              );
         }
 
-
+        return function(string $value) use ($labels): string {
-        return function($value) use ($labels) {
             return $labels[$value];
         };
 

src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php

@@ -144,6 +144,8 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
 
     public function getLabels($key, array $values, $data)
     {
+        $labels = [];
+
         if ($data['group_by_level'] === 'country') {
             $qb = $this->countriesRepository->createQueryBuilder('c');
 
@@ -154,15 +156,17 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
                     ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
 
             // initialize array and add blank key for null values
-            $labels[''] = $this->translator->trans('without data');
+            $labels = [
-            $labels['_header'] = $this->translator->trans('Nationality');
+                '' => $this->translator->trans('without data'),
+                '_header' => $this->translator->trans('Nationality'),
+            ];
+
             foreach($countries as $row) {
                 $labels[$row['c_countryCode']] = $this->translatableStringHelper->localize($row['c_name']);
             }
+        }
 
-
+        if ($data['group_by_level'] === 'continent') {
-        } elseif ($data['group_by_level'] === 'continent') {
-
             $labels = array(
                 'EU' => $this->translator->trans('Europe'),
                 'AS' => $this->translator->trans('Asia'),
@@ -176,8 +180,7 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
              );
         }
 
-
+        return function(string $value) use ($labels): string {
-        return function($value) use ($labels) {
             return $labels[$value];
         };
 

src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php

@@ -1,8 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\Household;
 
-use Chill\PersonBundle\Entity\Household\HouseholdMembers;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
@@ -12,6 +14,6 @@ final class HouseholdMembersRepository
 
     public function __construct(EntityManagerInterface $entityManager)
     {
-        $this->repository = $entityManager->getRepository(HouseholdMembers::class);
+        $this->repository = $entityManager->getRepository(HouseholdMember::class);
     }
 }

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue

@@ -16,16 +16,16 @@
    <comment v-if="accompanyingCourse.step === 'DRAFT'"></comment>
    <confirm v-if="accompanyingCourse.step === 'DRAFT'"></confirm>
 
-    <div v-for="error in errorMsg" class="vue-component errors alert alert-danger">
+    <!-- <div v-for="error in errorMsg" v-bind:key="error.id" class="vue-component errors alert alert-danger">
        <p>
           <span>{{ error.sta }} {{ error.txt }}</span><br>
           <span>{{ $t(error.msg) }}</span>
        </p>
-    </div>
+    </div> -->
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapGetters, mapState } from 'vuex'
 import Banner from './components/Banner.vue';
 import StickyNav from './components/StickyNav.vue';
 import OriginDemand from './components/OriginDemand.vue';
@@ -55,11 +55,12 @@ export default {
       Comment,
       Confirm,
    },
-   computed: mapState([
+   computed: {
+      ...mapState([
          'accompanyingCourse',
-      'addressContext',
+         'addressContext'
-      'errorMsg'
+      ]),
-   ])
+   },
 };
 </script>
 

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js

@@ -86,7 +86,8 @@ const postParticipation = (id, payload, method) => {
       })
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw { msg: 'Error while sending AccompanyingPeriod Course participation.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
+         // TODO: adjust message according to status code? Or how to access the message from the violation array?
+         throw { msg: 'Error while sending AccompanyingPeriod Course participation', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
       });
 };
 

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue

@@ -10,13 +10,13 @@
          <VueMultiselect
             name="selectOrigin"
             label="text"
-            v-bind:custom-label="transText"
+            :custom-label="transText"
             track-by="id"
-            v-bind:multiple="false"
+            :multiple="false"
-            v-bind:searchable="true"
+            :searchable="true"
-            v-bind:placeholder="$t('origin.placeholder')"
+            :placeholder="$t('origin.placeholder')"
             v-model="value"
-            v-bind:options="options"
+            :options="options"
             @select="updateOrigin">
          </VueMultiselect>
 
@@ -47,18 +47,18 @@ export default {
    },
    methods: {
       getOptions() {
-         //console.log('loading origins list');
          getListOrigins().then(response => new Promise((resolve, reject) => {
             this.options = response.results;
             resolve();
          }));
       },
       updateOrigin(value) {
-         //console.log('value', value);
+         console.log('value', value);
          this.$store.dispatch('updateOrigin', value);
       },
       transText ({ text }) {
-         return text.fr //TODO multilang
+         const parsedText = JSON.parse(text);
+         return parsedText.fr;
       },
    }
 }

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js

@@ -2,6 +2,8 @@ import { createApp } from 'vue'
 import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
 import { appMessages } from './js/i18n'
 import { initPromise } from './store'
+import VueToast from 'vue-toast-notification';
+import 'vue-toast-notification/dist/theme-sugar.css';
 
 import App from './App.vue';
 import Banner from './components/Banner.vue';
@@ -21,6 +23,7 @@ if (root === 'app') {
       })
       .use(store)
       .use(i18n)
+      .use(VueToast)
       .component('app', App)
       .mount('#accompanying-course');
    });

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js

@@ -77,7 +77,7 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
          },
          mutations: {
             catchError(state, error) {
-               console.log('### mutation: a new error have been catched and pushed in store !', error);
+               // console.log('### mutation: a new error have been catched and pushed in store !', error);
                state.errorMsg.push(error);
             },
             removeParticipation(state, participation) {

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue

@@ -26,7 +26,7 @@
       </div>
 
       <div v-if="isLoadingSocialActions">
-        <p>spinner</p>
+        <i class="fa fa-circle-o-notch fa-spin fa-fw"></i>
       </div>
 
       <div v-if="hasSocialActionPicked" id="persons">
@@ -72,7 +72,7 @@
               {{ $t('action.save') }}
             </button>
             <button class="btn btn-save" v-show="isPostingWork" disabled>
-              {{ $t('Save') }}
+              {{ $t('action.save') }}
             </button>
           </li>
         </ul>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue

@@ -20,18 +20,25 @@
             v-bind:item="item">
          </suggestion-third-party>
 
+         <suggestion-user
+            v-if="item.result.type === 'user'"
+            v-bind:item="item">
+         </suggestion-user>
+
    </div>
 </template>
 
 <script>
 import SuggestionPerson from './TypePerson';
 import SuggestionThirdParty from './TypeThirdParty';
+import SuggestionUser from './TypeUser';
 
 export default {
    name: 'PersonSuggestion',
    components: {
       SuggestionPerson,
       SuggestionThirdParty,
+      SuggestionUser,
    },
    props: [
       'item', 

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue

@@ -0,0 +1,47 @@
+<template>
+    <div class="container usercontainer">
+      <div class="user-identification">
+        <span class="name">
+           {{ item.result.text }}
+        </span>
+      </div>
+    </div>
+    <div class="right_actions">
+      <span class="badge rounded-pill bg-secondary">
+        {{ $t('user')}}
+      </span>
+    </div>
+</template>
+
+<script>
+
+const i18n = {
+  messages: {
+    fr: {
+      user: 'Utilisateur' // TODO how to define other translations?
+    }
+  }
+};
+
+export default {
+   name: 'SuggestionUser',
+   props: ['item'],
+   i18n,
+   computed: {
+     hasParent() {
+       return this.$props.item.result.parent !== null;
+     },
+   }
+}
+</script>
+
+<style lang="scss" scoped>
+.usercontainer {
+ .userparent {
+    .name {
+      font-weight: bold;
+      font-variant: all-small-caps;
+    }
+ }
+}
+</style>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/delete.html.twig

@@ -0,0 +1,34 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_person_accompanying_period_work_list' %}
+
+{% block title 'accompanying_course_work.remove'|trans %}
+
+{% block content %}
+
+    <div class="accompanying_course_work-list">
+        <h2 class="badge-title">
+            <span class="title_label">{{ 'accompanying_course_work.action'|trans }}</span>
+            <span class="title_action">{{ work.socialAction|chill_entity_render_string }}</span>
+        </h2>
+
+        <div>
+            <h3>{{ "Associated peoples"|trans }}</h3>
+            <ul>
+            {% for p in work.persons %}
+               {{ p|chill_entity_render_box }}
+            {% endfor %}
+            </ul>
+        </div>
+    </div>
+
+
+    {{ include('@ChillMain/Util/confirmation_template.html.twig',
+        {
+            'title'             : 'accompanying_course_work.remove'|trans,
+            'confirm_question'  : 'Are you sure you want to remove this work of the accompanying period %name% ?'|trans({ '%name%' : accompanyingCourse.id } ),
+            'cancel_route'      : 'chill_person_accompanying_period_work_list',
+            'cancel_parameters' : {'id' : accompanyingCourse.id},
+            'form'              : delete_form
+        } ) }}
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig

@@ -103,6 +103,11 @@
                 href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
               >{% if buttonText is not defined or buttonText == true %}{{ 'Edit'|trans }}{% endif %}</a>
             </li>
+            <li>
+              <a class="btn btn-delete" title="{{ 'Delete'|trans }}"
+                href="{{ path('chill_person_accompanying_period_work_delete', { 'id': w.id } ) }}"
+              >{% if buttonText is not defined or buttonText == true %}{{ 'Delete'|trans }}{% endif %}</a>
+            </li>
           </ul>
 
         </div>

src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig

@@ -62,7 +62,7 @@
             {%- endif -%}
             {%- if options['addId'] -%}
                 <span class="id-number" title="{{ 'Person'|trans ~ ' n° ' ~ person.id }}">
-                    {{ person.id|upper }}
+                    {{ person.id|upper -}}
                 </span>
             {%- endif -%}
         </div>
@@ -95,7 +95,7 @@
                 </time>
                 {%- if options['addAge'] -%}
                     <span class="age">
-                        ({{ 'years_old'|trans({ 'age': person.age }) }})
+                        {{- 'years_old'|trans({ 'age': person.age }) -}}
                     </span>
                 {%- endif -%}
             {%- endif -%}

src/Bundle/ChillPersonBundle/Search/PersonSearch.php

@@ -263,8 +263,9 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
 
     public function convertTermsToFormData(array $terms)
     {
-        foreach(['firstname', 'lastname', 'gender', '_default']
+        $data = [];
-            as $key) {
+
+        foreach(['firstname', 'lastname', 'gender', '_default'] as $key) {
             $data[$key] = $terms[$key] ?? null;
         }
 

src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php

@@ -38,7 +38,7 @@ class SocialActionRender implements ChillEntityRenderInterface
     {
         /** @var $socialAction SocialAction */
         $options = \array_merge(self::DEFAULT_ARGS, $options);
-        $titles[] = $this->translatableStringHelper->localize($socialAction->getTitle());
+        $titles = [$this->translatableStringHelper->localize($socialAction->getTitle())];
 
         while ($socialAction->hasParent()) {
             $socialAction = $socialAction->getParent();

src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php

@@ -38,8 +38,7 @@ final class SocialIssueRender implements ChillEntityRenderInterface
         /** @var $socialIssue SocialIssue */
         $options = array_merge(self::DEFAULT_ARGS, $options);
 
-        $titles[] = $this->translatableStringHelper
+        $titles = [$this->translatableStringHelper->localize($socialIssue->getTitle())];
-            ->localize($socialIssue->getTitle());
 
         // loop to parent, until root
         while ($socialIssue->hasParent()) {

src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidity.php

@@ -11,7 +11,7 @@ class LocationValidity extends Constraint
 {
     public $messagePersonLocatedMustBeAssociated = "The person where the course is located must be associated to the course. Change course's location before removing the person.";
 
-    public $messagePeriodMustRemainsLocated = "The period must remains located";
+    public $messagePeriodMustRemainsLocated = "The period must remain located";
 
     public function getTargets()
     {

src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlap.php

@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
+
+use Symfony\Component\Validator\Constraint;
+
+
+/**
+ * @Annotation
+ */
+class ParticipationOverlap extends Constraint
+{
+    public $message = 'This participation already exists.';
+}

src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php

@@ -0,0 +1,72 @@
+<?php
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
+
+use Chill\MainBundle\Util\DateRangeCovering;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOverlap;
+use Doctrine\Common\Collections\Collection;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+
+class ParticipationOverlapValidator extends ConstraintValidator
+{
+    private const MAX_PARTICIPATION = 1;
+
+    public function validate($participations, Constraint $constraint)
+    {
+        if (!$constraint instanceof ParticipationOverlap) {
+            throw new UnexpectedTypeException($constraint, ParticipationOverlap::class);
+        }
+
+        if (!$participations instanceof Collection) {
+            throw new UnexpectedTypeException($participations, 'This should be a collection');
+        }
+
+        if (count($participations) <= self::MAX_PARTICIPATION) {
+            return;
+        }
+
+        $overlaps = new DateRangeCovering(self::MAX_PARTICIPATION, $participations[0]->getStartDate()->getTimezone());
+
+        foreach ($participations as $participation) {
+
+            if (!$participation instanceof AccompanyingPeriodParticipation) {
+                throw new UnexpectedTypeException($participation, AccompanyingPeriodParticipation::class);
+            }
+
+            $personId = $participation->getPerson()->getId();
+ 
+            $particpationList[$personId][] = $participation;
+
+        }
+
+        foreach ($particpationList as $group) {
+            if (count($group) > 1) {
+                foreach ($group as $p) {
+                    $overlaps->add($p->getStartDate(), $p->getEndDate(), $p->getId());
+                }
+            }
+        }
+
+        $overlaps->compute();
+
+        if ($overlaps->hasIntersections()) {
+            foreach ($overlaps->getIntersections() as list($start, $end, $ids)) {
+                $msg = $end === null ? $constraint->message :
+                    $constraint->message;
+
+                $this->context->buildViolation($msg)
+                    ->setParameters([
+                        '{{ start }}' => $start->format('d-m-Y'),
+                        '{{ end }}' => $end === null ? null : $end->format('d-m-Y'),
+                        '{{ ids }}' => $ids,
+                    ])
+                    ->addViolation();
+            }
+        }
+
+    }
+}

src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheck.php

@@ -0,0 +1,16 @@
+<?php
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
+
+use Symfony\Component\Validator\Constraint;
+
+
+/**
+ * @Annotation
+ */
+class ResourceDuplicateCheck extends Constraint
+{
+    public $message = '{{ name }} is already associated to this accompanying course.';
+}
+

src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheckValidator.php

@@ -0,0 +1,56 @@
+<?php
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Templating\Entity\PersonRender;
+use Doctrine\Common\Collections\Collection;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ResourceDuplicateCheck;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
+
+class ResourceDuplicateCheckValidator extends ConstraintValidator
+{
+
+    private PersonRender $personRender;
+    private ThirdPartyRender $thirdpartyRender;
+
+    public function __construct(PersonRender $personRender, ThirdPartyRender $thirdPartyRender)
+    {
+        $this->personRender = $personRender;
+        $this->thirdpartyRender = $thirdPartyRender;
+    }
+
+    public function validate($resources, Constraint $constraint)
+    {
+        if (!$constraint instanceof ResourceDuplicateCheck) {
+            throw new UnexpectedTypeException($constraint, ParticipationOverlap::class);
+        }
+
+        if (!$resources instanceof Collection) {
+            throw new UnexpectedTypeException($resources, Collection::class);
+        }
+
+        $resourceList = [];
+
+        foreach ($resources as $resource) {
+            $id = ($resource->getResource() instanceof Person ? 'p' :
+                't').$resource->getResource()->getId();
+
+            if (\in_array($id, $resourceList, true)) {
+                $this->context->buildViolation($constraint->message)
+                    ->setParameter('{{ name }}', $resource->getResource() instanceof Person ? $this->personRender->renderString($resource->getResource(), []) : 
+                        $this->thirdpartyRender->renderString($resource->getResource(), []))
+                    ->addViolation();
+            }
+
+            $resourceList[] = $id;
+            
+        }
+
+    }
+
+}

src/Bundle/ChillPersonBundle/config/services/validator.yaml

@@ -0,0 +1,6 @@
+services:
+  Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod:
+    autowire: true
+    autoconfigure: true
+    tags: ['validator.service_arguments']
+    

src/Bundle/ChillPersonBundle/migrations/Version20211020131133.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Validation added to accompanying period resources and accompanying period.
+ */
+final class Version20211020131133 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Validation added to accompanying period resources and accompanying period.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE UNIQUE INDEX person_unique ON chill_person_accompanying_period_resource (person_id, accompanyingperiod_id) WHERE person_id IS NOT NULL');
+        $this->addSql('CREATE UNIQUE INDEX thirdparty_unique ON chill_person_accompanying_period_resource (thirdparty_id, accompanyingperiod_id) WHERE thirdparty_id IS NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX person_unique');
+        $this->addSql('DROP INDEX thirdparty_unique');
+    }
+}

src/Bundle/ChillPersonBundle/migrations/Version20211021125359.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Custom constraint added to database to prevent identical participations.
+ */
+final class Version20211021125359 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Custom constraint added to database to prevent identical participations.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // creates a constraint 'participations may not overlap'
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ADD CONSTRAINT '.
+            "participations_no_overlap EXCLUDE USING GIST(
+            -- extension btree_gist required to include comparaison with integer
+            person_id WITH =, accompanyingperiod_id WITH =,
+            daterange(startdate, enddate) WITH &&
+        )
+        INITIALLY DEFERRED");
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('CREATE UNIQUE INDEX participation_unique ON chill_person_accompanying_period_participation (accompanyingperiod_id, person_id)');
+    }
+}

src/Bundle/ChillPersonBundle/translations/messages.fr.yml

@@ -405,6 +405,8 @@ Back to household: Revenir au ménage
 # accompanying course work
 Accompanying Course Actions: Actions d'accompagnements
 Accompanying Course Action: Action d'accompagnement
+Are you sure you want to remove this work of the accompanying period %name% ?: Êtes-vous sûr de vouloir supprimer cette action de la période d'accompagnement %name% ?
+The accompanying period work has been successfully removed.: L'action d'accompagnement a été supprimée.
 accompanying_course_work:
     create: Créer une action
     Create accompanying course work: Créer une action d'accompagnement
@@ -419,6 +421,7 @@ accompanying_course_work:
     results: Résultats - orientations
     goal: Objectif - motif - dispositif
     Any work: Aucune action d'accompagnement
+    remove: Supprimer une action d'accompagnement
 
 #
 Person addresses: Adresses de résidence

src/Bundle/ChillPersonBundle/translations/validators.fr.yml

@@ -41,3 +41,6 @@ household:
 household_membership:
     The end date must be after start date: La date de la fin de l'appartenance doit être postérieure à la date de début.
     Person with membership covering: Une personne ne peut pas appartenir à deux ménages simultanément. Or, avec cette modification, %person_name% appartiendrait à %nbHousehold% ménages à partir du %from%.
+
+# Accompanying period
+'{{ name }} is already associated to this accompanying course.': '{{ name }} est déjà associé avec ce parcours.' 

src/Bundle/ChillReportBundle/Export/Export/ReportList.php

@@ -196,9 +196,8 @@ class ReportList implements ListInterface, ExportElementValidatedInterface
      * @param type $key
      * @param array $values
      * @param type $data
-     * @return type
      */
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): \Closure
     {
         switch ($key) {
             case 'person_birthdate':
@@ -237,12 +236,13 @@ class ReportList implements ListInterface, ExportElementValidatedInterface
                     ;
                 $rows = $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
 
+                $scopes = [];
+
                 foreach($rows as $row) {
-                    $scopes[$row['id']] = $this->translatableStringHelper
+                    $scopes[$row['id']] = $this->translatableStringHelper->localize($row['name']);
-                        ->localize($row['name']);
                 }
 
-                return function($value) use ($scopes) {
+                return function($value) use ($scopes): string {
                     if ($value === '_header') {
                         return 'circle';
                     }
@@ -258,11 +258,13 @@ class ReportList implements ListInterface, ExportElementValidatedInterface
                     ;
                 $rows = $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
 
+                $users = [];
+
                 foreach($rows as $row) {
                     $users[$row['id']] = $row['username'];
                 }
 
-                return function($value) use ($users) {
+                return function($value) use ($users): string {
                     if ($value === '_header') {
                         return 'user';
                     }

src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php

@@ -157,7 +157,7 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
 
 
         // the parameters
-        $parameters = [];
+        $parameters = $circleIds = [];
 
         // the clause that we will fill
         $clause = "{person}.{person_id} = ? AND {task}.{circle} IN ({circle_ids})";

src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Serializer\Normalizer;
 
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
@@ -20,23 +22,24 @@ class ThirdPartyNormalizer implements NormalizerInterface, NormalizerAwareInterf
         $this->thirdPartyRender = $thirdPartyRender;
     }
 
+    /**
+     * @param ThirdParty $thirdParty
+     */
     public function normalize($thirdParty, string $format = null, array $context = [])
     {
-        /** @var $thirdParty ThirdParty */
+        return [
-        $data['type'] = 'thirdparty';
+            'type' => 'thirdparty',
-        $data['text'] = $this->thirdPartyRender->renderString($thirdParty, []);
+            'text' => $this->thirdPartyRender->renderString($thirdParty, []),
-        $data['id'] = $thirdParty->getId();
+            'id' => $thirdParty->getId(),
-        $data['kind'] = $thirdParty->getKind();
+            'kind' => $thirdParty->getKind(),
-        $data['address'] = $this->normalizer->normalize($thirdParty->getAddress(), $format,
+            'address' => $this->normalizer->normalize($thirdParty->getAddress(), $format, [ 'address_rendering' => 'short' ]),
-            [ 'address_rendering' => 'short' ]);
+            'phonenumber' => $thirdParty->getTelephone(),
-        $data['phonenumber'] = $thirdParty->getTelephone();
+            'email' => $thirdParty->getEmail(),
-        $data['email'] = $thirdParty->getEmail();
+            'isChild' => $thirdParty->isChild(),
-        $data['isChild'] = $thirdParty->isChild();
+            'parent' => $this->normalizer->normalize($thirdParty->getParent(), $format, $context),
-        $data['parent'] = $this->normalizer->normalize($thirdParty->getParent(), $format, $context);
+            'civility' => $this->normalizer->normalize($thirdParty->getCivility(), $format, $context),
-        $data['civility'] = $this->normalizer->normalize($thirdParty->getCivility(), $format, $context);
+            'contactDataAnonymous' => $thirdParty->isContactDataAnonymous(),
-        $data['contactDataAnonymous'] = $thirdParty->isContactDataAnonymous();
+        ];
-
-        return $data;
     }
 
     public function supportsNormalization($data, string $format = null)